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

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

@@ -0,0 +1,37 @@
+package com.management.platform.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.management.platform.entity.ContractModifyRecord;
+import com.management.platform.service.ContractModifyRecordService;
+import com.management.platform.util.HttpRespMsg;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-07-26
+ */
+@RestController
+@RequestMapping("/contract-modify-record")
+public class ContractModifyRecordController {
+    @Autowired
+    private ContractModifyRecordService contractModifyRecordService;
+
+    @RequestMapping("/list")
+    public HttpRespMsg list(Integer projectId){
+        HttpRespMsg httpRespMsg=new HttpRespMsg();
+        List<ContractModifyRecord> contractModifyRecordList = contractModifyRecordService.list(new QueryWrapper<ContractModifyRecord>().eq("project_id", projectId));
+        httpRespMsg.data=contractModifyRecordList;
+        return httpRespMsg;
+    }
+}
+

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

@@ -827,5 +827,9 @@ public class ProjectController {
     public HttpRespMsg exportUserWorkingTimeStatic(String startDate,String endDate,String userId,Integer departmentId){
         return projectService.exportUserWorkingTimeStatic(startDate,endDate,request,userId,departmentId);
     }
+    @RequestMapping("/modifyContract")
+    public HttpRespMsg modifyContract(Integer projectId,Double oldContractAmount,Double newContractAmount,String reason,HttpServletRequest request){
+        return projectService.modifyContract(projectId,oldContractAmount,newContractAmount,reason,request);
+    }
 }
 

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

@@ -0,0 +1,64 @@
+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-07-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class ContractModifyRecord extends Model<ContractModifyRecord> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 修改前金额
+     */
+    @TableField("old_contract_amount")
+    private Double oldContractAmount;
+
+    /**
+     * 修改后金额
+     */
+    @TableField("new_contract_amount")
+    private Double newContractAmount;
+
+    @TableField("update_date")
+    private LocalDateTime updateDate;
+
+    @TableField("project_id")
+    private Integer projectId;
+
+    @TableField("reason")
+    private String reason;
+
+    /**
+     * 操作人
+     */
+    @TableField("edit_user_id")
+    private String editUserId;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

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

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

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

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

@@ -156,4 +156,6 @@ public interface ProjectService extends IService<Project> {
     HttpRespMsg exportUserWorkingTimeStatic(String startDate, String endDate, HttpServletRequest request, String userId, Integer departmentId);
 
     HttpRespMsg batchDeleteProject(String projectIdArray, HttpServletRequest request);
+
+    HttpRespMsg modifyContract(Integer projectId, Double oldContractAmount, Double newContractAmount,String reason,HttpServletRequest request);
 }

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

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.ContractModifyRecord;
+import com.management.platform.mapper.ContractModifyRecordMapper;
+import com.management.platform.service.ContractModifyRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-07-26
+ */
+@Service
+public class ContractModifyRecordServiceImpl extends ServiceImpl<ContractModifyRecordMapper, ContractModifyRecord> implements ContractModifyRecordService {
+
+}

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

@@ -142,6 +142,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     ProjectLevelMapper projectLevelMapper;
     @Resource
     DepartmentOtherManagerMapper departmentOtherManagerMapper;
+    @Resource
+    ContractModifyRecordMapper contractModifyRecordMapper;
 
     @Resource
     private HttpServletResponse response;
@@ -4456,8 +4458,29 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         return httpRespMsg;
     }
 
+    @Override
+    public HttpRespMsg modifyContract(Integer projectId, Double oldContractAmount, Double newContractAmount,String reason,HttpServletRequest request) {
+        HttpRespMsg httpRespMsg=new HttpRespMsg();
+        User user = userMapper.selectById(request.getHeader("token"));
+        Project project = projectMapper.selectById(projectId);
+        project.setContractAmount(newContractAmount);
+        projectMapper.updateById(project);
+        ContractModifyRecord contractModifyRecord=new ContractModifyRecord();
+        contractModifyRecord.setNewContractAmount(newContractAmount);
+        contractModifyRecord.setOldContractAmount(oldContractAmount);
+        contractModifyRecord.setProjectId(projectId);
+        contractModifyRecord.setUpdateDate(LocalDateTime.now());
+        contractModifyRecord.setReason(reason);
+        contractModifyRecord.setEditUserId(user.getId());
+        if(contractModifyRecordMapper.insert(contractModifyRecord)<=0){
+            httpRespMsg.setError("验证失败");
+            return httpRespMsg;
+        }
+        return httpRespMsg;
+    }
+
 
-	private List<Department> getSubDepts(Department dp, List<Department> list) {
+    private List<Department> getSubDepts(Department dp, List<Department> list) {
         List<Department> collect = list.stream().filter(l -> dp.getDepartmentId().equals(l.getSuperiorId())).collect(Collectors.toList());
         List<Department> allList = new ArrayList<>();
         allList.addAll(collect);

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

@@ -0,0 +1,21 @@
+<?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.ContractModifyRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.ContractModifyRecord">
+        <id column="id" property="id" />
+        <result column="old_contract_amount" property="oldContractAmount" />
+        <result column="new_contract_amount" property="newContractAmount" />
+        <result column="update_date" property="updateDate" />
+        <result column="project_id" property="projectId" />
+        <result column="reason" property="reason" />
+        <result column="edit_user_id" property="editUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, old_contract_amount, new_contract_amount, update_date, project_id, reason, edit_user_id
+    </sql>
+
+</mapper>