Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

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

@@ -80,8 +80,8 @@ public class ContractController {
      * 审核合同
      */
     @RequestMapping("/processContract")
-    public HttpRespMsg processContract (HttpServletRequest request,Integer id,Integer status){
-        return contractService.processContract(request,id,status);
+    public HttpRespMsg processContract (HttpServletRequest request,Integer id,Integer status,String msg){
+        return contractService.processContract(request,id,status,msg);
     }
 
     /**

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ContractLogController.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 2022-12-16
+ */
+@RestController
+@RequestMapping("/contract-log")
+public class ContractLogController {
+
+}
+

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

@@ -0,0 +1,76 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+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 2022-12-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class ContractLog extends Model<ContractLog> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 合同的id
+     */
+    @TableField("contract_id")
+    private Integer contractId;
+
+    /**
+     * 操作时间
+     */
+    @TableField("operate_date")
+    private LocalDateTime operateDate;
+
+    /**
+     * 创建者id
+     */
+    @TableField("creator_id")
+    private String creatorId;
+
+    /**
+     * 操作者id
+     */
+    @TableField("operator_id")
+    private String operatorId;
+
+    /**
+     * 0-新增操作；1-编辑操作；2-审核通过；3-审核驳回；4-批量导入;5-删除合同
+     */
+    @TableField("type")
+    private Integer type;
+
+    /**
+     * 操作信息
+     */
+    @TableField("msg")
+    private String msg;
+
+    @TableField("company_id")
+    private Integer companyId;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

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

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

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

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

@@ -29,7 +29,7 @@ public interface ContractService extends IService<Contract> {
 
     HttpRespMsg importContract(HttpServletRequest request, MultipartFile file);
 
-    HttpRespMsg processContract(HttpServletRequest request, Integer id, Integer status);
+    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/impl/ContractLogServiceImpl.java

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.ContractLog;
+import com.management.platform.mapper.ContractLogMapper;
+import com.management.platform.service.ContractLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-12-16
+ */
+@Service
+public class ContractLogServiceImpl extends ServiceImpl<ContractLogMapper, ContractLog> implements ContractLogService {
+
+}

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

@@ -61,6 +61,8 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
     private ContractDocumentMapper contractDocumentMapper;
     @Resource
     private SysFunctionMapper sysFunctionMapper;
+    @Resource
+    private ContractLogMapper contractLogMapper;
     @Value(value = "${upload.path}")
     private String path;
 
@@ -306,6 +308,15 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
         contract.setCreatorId(user.getId());
         contract.setCompanyId(user.getCompanyId());
         contractMapper.insert(contract);
+        ContractLog contractLog = new ContractLog();
+        contractLog.setCompanyId(user.getCompanyId());
+        contractLog.setCreatorId(user.getId());
+        contractLog.setContractId(contract.getId());
+        contractLog.setOperateDate(LocalDateTime.now());
+        contractLog.setOperatorId(user.getId());
+        contractLog.setType(0);
+        contractLog.setMsg("创建了合同。");
+        contractLogMapper.insert(contractLog);
         httpRespMsg.msg = MessageUtils.message("contract.addSuc");
         httpRespMsg.data = contract.getId();
         return httpRespMsg;
@@ -348,6 +359,15 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
             contract.setStatus(1);
             contract.setIndate(null);
             contractMapper.updateById(contract);
+            ContractLog contractLog = new ContractLog();
+            contractLog.setCompanyId(user.getCompanyId());
+            contractLog.setCreatorId(contract.getCreatorId());
+            contractLog.setContractId(contract.getId());
+            contractLog.setOperateDate(LocalDateTime.now());
+            contractLog.setOperatorId(user.getId());
+            contractLog.setType(1);
+            contractLog.setMsg("编辑了合同。");
+            contractLogMapper.insert(contractLog);
             httpRespMsg.msg = MessageUtils.message("contract.editSuc");
             return httpRespMsg;
         }catch (NullPointerException e) {
@@ -506,6 +526,15 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
                     contractMapper.insert(contract);
                     i++;
                 }
+                ContractLog contractLog = new ContractLog();
+                contractLog.setCompanyId(user.getCompanyId());
+                contractLog.setCreatorId(user.getId());
+                contractLog.setContractId(null);
+                contractLog.setOperateDate(LocalDateTime.now());
+                contractLog.setOperatorId(user.getId());
+                contractLog.setType(4);
+                contractLog.setMsg("批量导入了合同。");
+                contractLogMapper.insert(contractLog);
                 msg.data = i;
                 String originName = fileName;
                 //定义一个独立的文件夹
@@ -569,21 +598,38 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
      * @return
      */
     @Override
-    public HttpRespMsg processContract(HttpServletRequest request, Integer id, Integer status) {
-        HttpRespMsg msg = new HttpRespMsg();
+    public HttpRespMsg processContract(HttpServletRequest request, Integer id, Integer status ,String msg) {
+        HttpRespMsg HttpRespMsg = new HttpRespMsg();
         String token = request.getHeader("TOKEN");
         User user = userMapper.selectById(token);
         List<SysRichFunction> functionContractList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "审核合同");
         if(functionContractList.size() <= 0){
-            msg.setError(MessageUtils.message("access.operationError"));
-            return msg;
+            HttpRespMsg.setError(MessageUtils.message("access.operationError"));
+            return HttpRespMsg;
         }
         Contract contract = new Contract();
         contract.setId(id);
         contract.setCheckerId(user.getId());
         contract.setStatus(status);
         contractMapper.updateById(contract);
-        return msg;
+        ContractLog contractLog = new ContractLog();
+        contractLog.setCompanyId(user.getCompanyId());
+        contractLog.setCreatorId(contract.getCreatorId());
+        contractLog.setContractId(contract.getId());
+        contractLog.setOperateDate(LocalDateTime.now());
+        contractLog.setOperatorId(user.getId());
+        if (status.equals(0)){
+            contractLog.setType(2);
+            contractLog.setMsg("审核通过了合同。");
+        }else if (status.equals(2)){
+            contractLog.setType(3);
+            if (StringUtils.isBlank(msg)){
+                msg = "";
+            }
+            contractLog.setMsg("驳回了合同。原因：" + msg);
+        }
+        contractLogMapper.insert(contractLog);
+        return HttpRespMsg;
     }
 
     /**
@@ -643,6 +689,16 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
         for (ContractDocument contractDocument : contractFile) {
             contractDocumentMapper.updateById(contractDocument);
         }
+        Contract contract = contractMapper.selectById(id);
+        ContractLog contractLog = new ContractLog();
+        contractLog.setCompanyId(user.getCompanyId());
+        contractLog.setCreatorId(contract.getCreatorId());
+        contractLog.setContractId(contract.getId());
+        contractLog.setOperateDate(LocalDateTime.now());
+        contractLog.setOperatorId(user.getId());
+        contractLog.setType(5);
+        contractLog.setMsg("删除了合同。");
+        contractLogMapper.insert(contractLog);
         msg.msg = MessageUtils.message("other.deleteScu");
         return msg;
     }

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

@@ -8723,12 +8723,14 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 String start_date = sdf.format((Date) map.get("start_date"));
                 String end_date = sdf.format((Date) map.get("end_date"));
                 String projectId = ""+ (Integer) map.get("id");
-                System.out.println(map);
+                System.err.println(map);
                 //String exeId = "任务_"+map.get("task_id") +"_"+ (type==0?(Integer) map.get("exe_id"):userId);
                 String exeId = MessageUtils.message("excel.task") + "_"+map.get("task_id") +"_"+ (type==0?(Integer) map.get("exe_id"):userId);
                 String taskId = ""+ (Integer) map.get("task_id");
-                int level = Integer.parseInt(map.get("level").toString());
-
+                Integer level = null;
+                if(map.containsKey("level")){
+                    level = map.get("level")==null?null:Integer.parseInt(map.get("level")+"");
+                }
                 GanttDataItem curItem = new GanttDataItem();;
                 if (type == 0) {
                     if (!userId.equals(lastItemId)) {

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

@@ -0,0 +1,22 @@
+<?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.ContractLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.ContractLog">
+        <id column="id" property="id" />
+        <result column="contract_id" property="contractId" />
+        <result column="operate_date" property="operateDate" />
+        <result column="creator_id" property="creatorId" />
+        <result column="operator_id" property="operatorId" />
+        <result column="type" property="type" />
+        <result column="msg" property="msg" />
+        <result column="company_id" property="companyId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, contract_id, operate_date, creator_id, operator_id, type, msg, company_id
+    </sql>
+
+</mapper>

fhKeeper/formulahousekeeper/timesheet/src/views/project/vueGantt.vue

@@ -31,7 +31,10 @@
                   <!-- <span v-if="scope.row.translationType == 'user' && scope.column.label.indexof(scope.row.end_date) != '-1'">
                     <ww-open-data type='userName' :openid='scope.row.text'></ww-open-data>
                   </span> -->
-                  <span v-if="scope.row.translationType != 'user'">
+                  <span v-if="scope.row.translationType != 'user' && stafforpro != '按项目查看'">
+                    {{scope.row.end_date | dataValue(scope.column, scope.row)}}
+                  </span>
+                  <span v-if="stafforpro == '按项目查看'">
                     {{scope.row.end_date | dataValue(scope.column, scope.row)}}
                   </span>
                 </div>