Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/header/header.vue

@@ -48,9 +48,11 @@
     </div>
   </div>
   <div class="flex flex-row justify-start items-center text-white header-right">
-    <el-icon :size="26" class="ml-4 cursor-pointer">
-      <Bell />
-    </el-icon>
+    <el-badge :value="12" :max="99" class="ml-4 cursor-pointer h-[26px]">
+      <el-icon :size="26" @click="newsDrawer = true">
+        <Bell />
+      </el-icon>
+    </el-badge>
     <div>
       <img class="w- h-8 rounded-full ml-4 cursor-pointer" :src="defaultCover" alt="" @click="drawerVis = true">
     </div>
@@ -77,13 +79,38 @@
       </div>
     </div>
   </el-drawer>
+
+  <!-- 消息 -->
+  <el-drawer v-model="newsDrawer" modal-class="drawerVisClass" :with-header="false" size="45%">
+    <div class="w-full h-full">
+      <el-table :data="newsDrawerTableData" style="width: 100%" v-loading="newsDrawerLoading">
+        <el-table-column prop="msg" label="消息内容">
+          <template #default="scope">
+            <el-link type="primary" :underline="false" @click="toDetail(scope.row)">{{ scope.row.msg }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column prop="checked" label="状态" width="100">
+          <template #default="scope">
+            <el-tag :type="scope.row.checked ? 'success' : 'danger'">
+              {{ scope.row.checked ? '已读' : '未读' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="time" label="时间" width="140" />
+      </el-table>
+    </div>
+  </el-drawer>
 </template>
+
+<!-- /information/list -->
   
 <script lang="ts" setup>
 import { onMounted, ref, watchEffect, watch } from 'vue';
 import { RouteRecordRaw, useRouter, useRoute } from 'vue-router';
 import { useStore } from "../../store/index"
+import { post, uploadFile } from "@/utils/request";
 import defaultCover from "../../assets/defaultCover.png";
+import { formatDate } from '@/utils/times'
 import loginLogin from '../../assets/login/login_logo.png'
 const { routers, clearStore, userInfo } = useStore()
 const router = useRouter();
@@ -96,7 +123,10 @@ const visibleItems = ref<number[]>([]);
 const parentDiv = ref<HTMLElement | null>(null);
 const itemLastIndex = ref(0)
 const moreRoutes = ref<any[]>([])
+const newsDrawerTableData = ref<any[]>([])
 const drawerVis = ref(false)
+const newsDrawer = ref(false)
+const newsDrawerLoading = ref(false)
 
 const updateVisibleItems = () => {
   const parentWidth = (parentDiv.value?.offsetWidth && parentDiv.value?.offsetWidth - 150) || 10;
@@ -184,7 +214,43 @@ const logout = () => {
   clearStore();
   router.push({ path: '/login' });
 };
+
+const getNewsDrawerTableData = () => {
+  newsDrawerLoading.value = true
+  post(`/information/list`, {}).then(res => {
+    const data = res.data.map((item: any) => {
+      return {
+        ...item,
+        time: formatDate(new Date(item.time))
+      }
+    })
+    newsDrawerTableData.value = data
+  }).catch(err => {
+    newsDrawerTableData.value = []
+    console.log(err)
+  }).finally(() => {
+    newsDrawerLoading.value = false
+  })
+}
+
+const toDetail = (row: any) => {
+  console.log(row, '<=== 点击数据')
+  const { id, type, path } = row
+  post(`/information/check`, { id }).then(res => {
+    console.log(res, '<=== 成功')
+    getNewsDrawerTableData()
+    if(path) {
+      router.push({ path });
+    }
+  }).catch(err => {
+    console.log(err, '<==== 失败')
+  }).finally(() => {
+    newsDrawer.value = false
+  })
+}
+
 onMounted(() => {
+  getNewsDrawerTableData()
   routerList.value = routers;
   activeRouter.value = routerList.value.find((item) => item.path === router.currentRoute.value.path);
 

fhKeeper/formulahousekeeper/management-crm/src/main/resources/application.yml

@@ -15,9 +15,12 @@ spring:
       location: C:/upload/
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.101.180.183:17089/man_crm?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&useSSL=false
+#    url: jdbc:mysql://47.101.180.183:17089/man_crm?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&useSSL=false
+#    username: root
+#    password: P011430@Huoshi*
+    url: jdbc:mysql://127.0.0.1:3306/man_crm?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&useSSL=false
     username: root
-    password: P011430@Huoshi*
+    password: p011430seya
 
     hikari:
       maximum-pool-size: 60

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ContractController.java

@@ -61,7 +61,13 @@ public class ContractController {
      */
     @RequestMapping("/importContract")
     public HttpRespMsg importContract (HttpServletRequest request, MultipartFile file){
-        return contractService.importContract(request,file);
+        String token = request.getHeader("TOKEN");
+        User user = userMapper.selectById(token);
+        if (user.getCompanyId() == 10) {
+            return contractService.importContractCustom(request,file);
+        } else {
+            return contractService.importContract(request,file);
+        }
     }
 
     /**

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ContractCustomController.java

@@ -0,0 +1,21 @@
+package com.management.platform.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-09-09
+ */
+@RestController
+@RequestMapping("/contract-custom")
+public class ContractCustomController {
+
+}
+

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportController.java

@@ -2192,6 +2192,12 @@ public class ReportController {
         return reportService.denyHisReport(hisId, reason, request);
     }
 
+    @RequestMapping("/batchDenyHisReport")
+    public HttpRespMsg batchDenyHisReport(@RequestParam Integer reportAuditLogId,
+                                     String reason, HttpServletRequest request) {
+        return reportService.batchDenyHisReport(reportAuditLogId, reason, request);
+    }
+
     @RequestMapping("/getMembList")
     public HttpRespMsg getMembList(@RequestParam(required=false) String date, HttpServletRequest request) {
         if (date == null) {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Contract.java

@@ -160,6 +160,8 @@ public class Contract extends Model<Contract> {
     @TableField(exist = false)
     private BigDecimal nextPaymentAmount;
 
+    @TableField(exist = false)
+    public ContractCustom customData;
     @Override
     protected Serializable pkVal() {
         return this.id;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/ContractCustom.java

@@ -0,0 +1,165 @@
+package com.management.platform.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-09-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class ContractCustom extends Model<ContractCustom> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 合同Id
+     */
+    @TableId("contract_id")
+    private Integer contractId;
+
+    /**
+     * 对方单位
+     */
+    @TableField("customer_org")
+    private String customerOrg;
+
+    /**
+     * 对方联系人
+     */
+    @TableField("customer_contact")
+    private String customerContact;
+
+    /**
+     * 对方电话
+     */
+    @TableField("customer_phone")
+    private String customerPhone;
+
+    /**
+     * 使用部门
+     */
+    @TableField("use_department")
+    private String useDepartment;
+
+    /**
+     * 经费来源
+     */
+    @TableField("funds_source")
+    private String fundsSource;
+
+    /**
+     * 合同承办人
+     */
+    @TableField("undertaker")
+    private String undertaker;
+
+    /**
+     * 代理人
+     */
+    @TableField("agent")
+    private String agent;
+
+    /**
+     * 签订日期
+     */
+    @TableField("sign_date")
+    private String signDate;
+
+    /**
+     * 备案日期
+     */
+    @TableField("filings_date")
+    private String filingsDate;
+
+    /**
+     * 增值税税率（%）
+     */
+    @TableField("tax_rate")
+    private Integer taxRate;
+
+    /**
+     * 合同金额（元）/不含税价
+     */
+    @TableField("amounts_no_tax")
+    private BigDecimal amountsNoTax;
+
+    /**
+     * 币种
+     */
+    @TableField("currency")
+    private String currency;
+
+    /**
+     * 已付款金额（元）
+     */
+    @TableField("payed_amount")
+    private BigDecimal payedAmount;
+
+    /**
+     * 付款类型:1-预付，2-报账
+     */
+    @TableField("pay_way")
+    private Integer payWay;
+
+    /**
+     * 凭证号
+     */
+    @TableField("bill_number")
+    private String billNumber;
+
+    /**
+     * 已冲销金额
+     */
+    @TableField("reserved_amounts")
+    private BigDecimal reservedAmounts;
+
+    /**
+     * 冲销凭证号
+     */
+    @TableField("reserved_bill_number")
+    private String reservedBillNumber;
+
+    /**
+     * 付款总金额
+     */
+    @TableField("total_payed_amounts")
+    private BigDecimal totalPayedAmounts;
+
+    /**
+     * 待付款金额
+     */
+    @TableField("pending_amounts")
+    private BigDecimal pendingAmounts;
+
+    /**
+     * 合同状态（是否结清）:1-履约中，2-履约结束
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 印花税税目
+     */
+    @TableField("stamp_duty_items")
+    private String stampDutyItems;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.contractId;
+    }
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ContractCustomMapper.java

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.ContractCustom;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-09-09
+ */
+public interface ContractCustomMapper extends BaseMapper<ContractCustom> {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ContractCustomService.java

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.ContractCustom;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-09-09
+ */
+public interface ContractCustomService extends IService<ContractCustom> {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ContractService.java

@@ -29,6 +29,8 @@ public interface ContractService extends IService<Contract> {
 
     HttpRespMsg importContract(HttpServletRequest request, MultipartFile file);
 
+    HttpRespMsg importContractCustom(HttpServletRequest request, MultipartFile file);
+
     HttpRespMsg processContract(HttpServletRequest request, Integer id, Integer status ,String msg);
 
     HttpRespMsg contractFile(HttpServletRequest request, Integer id);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ReportService.java

@@ -165,4 +165,6 @@ public interface ReportService extends IService<Report> {
     HttpRespMsg getReportListWithTransfer(String startDate, String endDate, String userIds, Integer projectId, Integer pageIndex, Integer pageSize);
 
     HttpRespMsg transferReport(String reportIds, Integer projectId, Integer groupId, Integer stageId);
+
+    HttpRespMsg batchDenyHisReport(Integer reportAuditLogId, String reason, HttpServletRequest request);
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ContractCustomServiceImpl.java

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.ContractCustom;
+import com.management.platform.mapper.ContractCustomMapper;
+import com.management.platform.service.ContractCustomService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-09-09
+ */
+@Service
+public class ContractCustomServiceImpl extends ServiceImpl<ContractCustomMapper, ContractCustom> implements ContractCustomService {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ExpenseSheetServiceImpl.java

@@ -567,6 +567,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
         User user = userMapper.selectById(userId);
         DateTimeFormatter yyyyMMdd = DateTimeFormatter.ofPattern("yyyyMMdd");
         String format = yyyyMMdd.format(LocalDate.now());
+        //TODO: 存在潜在bug,多个人同时提交时，可能会出现重复的code，考虑换成redis计数器
         List<ExpenseSheet> list = expenseSheetMapper.selectList(new QueryWrapper<ExpenseSheet>()
                 .eq("company_id", user.getCompanyId())
                 .like("code", format).orderByDesc("id").last("limit 1"));

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -5122,12 +5122,19 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                                 report.setWorkingTime(time);
                                 report.setMultiWorktime(timeType.getMultiWorktime());
                                 report.setFillUserid(user.getId());
-                                if (timeType.getNeedDeptAudit() == 0) {
-                                    report.setState(1);//导入的直接算审核通过
+                                //赛元微电子，导入的按照项目审核的模式进行
+                                if (company.getId() == 469) {
+                                    report.setState(0);//待审核员审核
                                 } else {
-                                    report.setState(-1);//待部门上级审核员审核
-                                    report.setDepartmentAuditState(1);//部门已审核，到上层领导审核
+                                    if (timeType.getNeedDeptAudit() == 0) {
+                                        report.setState(1);//导入的直接算审核通过
+                                    } else {
+                                        //赛元微电子，导入的按照项目审核的模式进行
+                                        report.setState(-1);
+                                        report.setDepartmentAuditState(1);//部门已审核，到上层领导审核
+                                    }
                                 }
+
                                 report.setCreateDate(LocalDate.parse(reportDate, dtf));
                                 report.setCost(reportCreator.getCost()==null?new BigDecimal(0) : reportCreator.getCost().multiply(new BigDecimal(time)));
                                 reportList.add(report);
@@ -5969,12 +5976,14 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 List<UserDailyWorkItem> noReportUserList = (List<UserDailyWorkItem>)noReportMsg.data;
                 //追加到最后
                 for (UserDailyWorkItem item : noReportUserList) {
-                    HashMap mapItem = item.toHashMap();
-                    mapItem.put("duration", 0);
-                    mapItem.put("isOvertime", 0);
-                    mapItem.put("createDate", item.getCreateDate());
-                    mapItem.put("state", 99);
-                    allReportByDate.add(mapItem);
+                    if (!"请假".equals(item.status)) {
+                        HashMap mapItem = item.toHashMap();
+                        mapItem.put("duration", 0);
+                        mapItem.put("isOvertime", 0);
+                        mapItem.put("createDate", item.getCreateDate());
+                        mapItem.put("state", 99);
+                        allReportByDate.add(mapItem);
+                    }
                 }
             }
             for (Map<String, Object> map : allReportByDate) {
@@ -6358,23 +6367,56 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                                 }
                             } else {
                                 //项目审核或分组审核
-                                if (String.valueOf(map.get("projectAuditState")).equals("0") || String.valueOf(map.get("groupAuditState")).equals("0")) {
-                                    String projectAuditorName = map.get("projectAuditorName") + "";
-                                    String projectAuditorId = map.get("projectAuditorId") + "";
-                                    if (needCorpWxTranslate||(dingding!=null&&dingding.getContactNeedTranslate()==1)) {
+                                if (timeType.getReportAuditType() == 7) {
+                                    //项目和部门并行审核模式
+                                    String str = "待";
+                                    if (String.valueOf(map.get("projectAuditState")).equals("0")) {
+                                        String projectAuditorName = map.get("projectAuditorName") + "";
+                                        if (needCorpWxTranslate) {
+                                            for (User userItem : userList) {
+                                                if (userItem.getId().equals(map.get("projectAuditorId"))) {
+                                                    projectAuditorName = "$userName=" + userItem.getCorpwxRealUserid() + "$";
+                                                    break;
+                                                }
+                                            }
+                                        }
+                                        str += "项目审核人("+projectAuditorName+")";
+                                    }
+                                    if (String.valueOf(map.get("departmentAuditState")).equals("0")) {
+                                        String deptAuditorId = map.get("deptAuditorName") + "";
                                         for (User userItem : userList) {
-                                            if (userItem.getId().equals(projectAuditorId)) {
-                                                if(needCorpWxTranslate){
-                                                    projectAuditorName = "$userName=" + userItem.getCorpwxUserid() + "$";
-                                                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-                                                    projectAuditorName = "$userName=" + userItem.getDingdingUserid() + "$";
+                                            if (userItem.getId().equals(deptAuditorId)) {
+                                                String deptAuditorName = userItem.getName();
+                                                if (needCorpWxTranslate) {
+                                                    deptAuditorName = "$userName=" + userItem.getCorpwxRealUserid() + "$";
                                                 }
-                                                item.add("待项目审核人" + "(" + projectAuditorName + ")审核");
+                                                if (str.length() > 1) str += "、";
+                                                str += "部门审核人("+deptAuditorName+")";
                                                 break;
                                             }
                                         }
-                                    } else {
-                                        item.add("待项目审核人" + "(" + projectAuditorName + ")审核");
+                                    }
+                                    str += "审核";
+                                    item.add(str);
+                                } else {
+                                    if (String.valueOf(map.get("projectAuditState")).equals("0") || String.valueOf(map.get("groupAuditState")).equals("0")) {
+                                        String projectAuditorName = map.get("projectAuditorName") + "";
+                                        String projectAuditorId = map.get("projectAuditorId") + "";
+                                        if (needCorpWxTranslate||(dingding!=null&&dingding.getContactNeedTranslate()==1)) {
+                                            for (User userItem : userList) {
+                                                if (userItem.getId().equals(projectAuditorId)) {
+                                                    if(needCorpWxTranslate){
+                                                        projectAuditorName = "$userName=" + userItem.getCorpwxUserid() + "$";
+                                                    }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+                                                        projectAuditorName = "$userName=" + userItem.getDingdingUserid() + "$";
+                                                    }
+                                                    item.add("待项目审核人" + "(" + projectAuditorName + ")审核");
+                                                    break;
+                                                }
+                                            }
+                                        } else {
+                                            item.add("待项目审核人" + "(" + projectAuditorName + ")审核");
+                                        }
                                     }
                                 }
                             }
@@ -6985,7 +7027,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 //发送个人微信通知
                 pushReject(str, reporter, user.getName(), reason);
             }
-
         } catch (NullPointerException e) {
             //httpRespMsg.setError("验证失败");
             httpRespMsg.setError(MessageUtils.message("access.verificationError"));
@@ -9826,4 +9867,17 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         }
         return msg;
     }
+
+    @Override
+    public HttpRespMsg batchDenyHisReport(Integer reportAuditLogId, String reason, HttpServletRequest request) {
+        List<ReportAlogMembdate> list = reportAlogMembdateMapper.selectList(new QueryWrapper<ReportAlogMembdate>().eq("rlog_id", reportAuditLogId));
+        for (ReportAlogMembdate logMembItem : list) {
+            HttpRespMsg msg = denyHisReport(logMembItem.getId(), reason, request);
+            if (msg.code.equals("error")) {
+                //异常需要跳出
+                return msg;
+            }
+        }
+        return new HttpRespMsg();
+    }
 }

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ContractCustomMapper.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.management.platform.mapper.ContractCustomMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.ContractCustom">
+        <id column="contract_id" property="contractId" />
+        <result column="customer_org" property="customerOrg" />
+        <result column="customer_contact" property="customerContact" />
+        <result column="customer_phone" property="customerPhone" />
+        <result column="use_department" property="useDepartment" />
+        <result column="funds_source" property="fundsSource" />
+        <result column="undertaker" property="undertaker" />
+        <result column="agent" property="agent" />
+        <result column="sign_date" property="signDate" />
+        <result column="filings_date" property="filingsDate" />
+        <result column="tax_rate" property="taxRate" />
+        <result column="amounts_no_tax" property="amountsNoTax" />
+        <result column="currency" property="currency" />
+        <result column="payed_amount" property="payedAmount" />
+        <result column="pay_way" property="payWay" />
+        <result column="bill_number" property="billNumber" />
+        <result column="reserved_amounts" property="reservedAmounts" />
+        <result column="reserved_bill_number" property="reservedBillNumber" />
+        <result column="total_payed_amounts" property="totalPayedAmounts" />
+        <result column="pending_amounts" property="pendingAmounts" />
+        <result column="status" property="status" />
+        <result column="stamp_duty_items" property="stampDutyItems" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        contract_id, customer_org, customer_contact, customer_phone, use_department, funds_source, undertaker, agent, sign_date, filings_date, tax_rate, amounts_no_tax, currency, payed_amount, pay_way, bill_number, reserved_amounts, reserved_bill_number, total_payed_amounts, pending_amounts, status, stamp_duty_items
+    </sql>
+
+</mapper>

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -1228,6 +1228,7 @@
                         <el-option :label="$t('state.alreadyPassedAndWaitingAudit')" value="1"></el-option>
                     </el-select>
                 </el-form-item>
+
                 <el-form-item prop="exportType" :label="$t('daoChuFangShi')" v-if="user.companyId == '936'">
                     <div class="exportReportRadio">
                         <el-radio v-model="exportType" :label="0">{{ $t('wanZhengDaoChu') }}</el-radio>