20220923

合同管理-合同登记借用

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/controller/WorkContractBorrowController.java

@@ -2,11 +2,9 @@ package com.jeeplus.test.workContract.controller;
 
 import com.jeeplus.common.utils.ResponseUtil;
 import com.jeeplus.test.workContract.domain.WorkContractBorrow;
-import com.jeeplus.test.workContract.domain.WorkContractFile;
-import com.jeeplus.test.workContract.service.WorkContractFileService;
+import com.jeeplus.test.workContract.domain.WorkContractBorrowMessage;
 import com.jeeplus.test.workContract.service.dto.WorkContractBorrowDto;
-import com.jeeplus.test.workContract.service.dto.WorkContractBorrowService;
-import com.jeeplus.test.workContract.service.dto.WorkContractFileDto;
+import com.jeeplus.test.workContract.service.WorkContractBorrowService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -14,6 +12,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Slf4j
 @Api(tags ="合同登记")
@@ -44,6 +43,15 @@ public class WorkContractBorrowController {
     }
 
     /**
+     * 根据contractInfoId修改状态status
+     */
+    @ApiOperation(value = "根据id修改状态status")
+    @PostMapping(value = "updateStatusByContractInfoId")
+    public void updateStatusByContractInfoId(@RequestBody WorkContractBorrowDto workContractBorrowDto) {
+        workContractBorrowService.updateStatusByContractInfoId(workContractBorrowDto);
+    }
+
+    /**
      * 根据id查询
      */
     @ApiOperation(value = "根据id查询")
@@ -60,4 +68,25 @@ public class WorkContractBorrowController {
     public WorkContractBorrow findByContractInfoId(@RequestParam String id) {
         return workContractBorrowService.findByContractInfoId(id);
     }
+
+    /**
+     * 根据id修改状态status
+     */
+    @ApiOperation(value = "根据id修改状态借用表status")
+    @PostMapping(value = "updateMessageStatusById")
+    public void updateMessageStatusById(@RequestBody WorkContractBorrowDto workContractBorrowDto) {
+        workContractBorrowService.updateMessageByBorrowId(workContractBorrowDto, workContractBorrowDto.getType());
+    }
+
+    @ApiOperation(value = "根据id删除借用表信息")
+    @GetMapping(value = "deleteById")
+    public void deleteById(@RequestParam String id) {
+        workContractBorrowService.deleteById(id);
+    }
+
+    @ApiOperation(value = "根据id查询借用表信息")
+    @GetMapping(value = "findMessageList")
+    public List<WorkContractBorrowMessage> findMessageList(@RequestParam String id) {
+        return workContractBorrowService.findMessageList(id);
+    }
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/domain/WorkContractBorrow.java

@@ -25,7 +25,7 @@ public class WorkContractBorrow extends BaseEntity {
 
     private String borrowData;
 
-    private String borrowRetureData;
+    private String borrowRetData;
 
     private String remarks;
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/domain/WorkContractBorrowMessage.java

@@ -12,13 +12,11 @@ public class WorkContractBorrowMessage extends BaseEntity {
 
     private String name;
 
-    private String no;
-
     private String borrowName;
 
     private String borrowData;
 
-    private String borrowRetureData;
+    private String borrowRetData;
 
     private String borrowType;
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/domain/WorkContractInfo.java

@@ -131,7 +131,7 @@ public class WorkContractInfo extends BaseEntity {
     /**
      * 归档状态
      */
-    @Query
+    @Query(tableColumn = "b.filedType")
     private String filedType;
 
     /**
@@ -152,6 +152,9 @@ public class WorkContractInfo extends BaseEntity {
     private String taskFiledId;
 
     @TableField(exist = false)
+    private String taskBorrowId;
+
+    @TableField(exist = false)
     private String createId;
 
     @TableField(exist = false)

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/mapper/WorkContractBorrowMapper.java

@@ -2,12 +2,23 @@ package com.jeeplus.test.workContract.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.test.workContract.domain.WorkContractBorrow;
+import com.jeeplus.test.workContract.domain.WorkContractBorrowMessage;
 import com.jeeplus.test.workContract.domain.WorkContractFile;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface WorkContractBorrowMapper extends BaseMapper<WorkContractBorrow> {
 
     void updateStatusById(@Param("id") String id, @Param("borrowType")String borrowType);
 
+    void updateStatusByContractInfoId(@Param("id") String id, @Param("borrowType")String borrowType);
+
     WorkContractBorrow selectFileByContractInfoId (@Param("id") String id);
+
+    void updateMessageByBorrowId(@Param("id") String id, @Param("borrowType")String borrowType, @Param("type")String type);
+
+    void deleteMessageById(@Param("id") String id);
+
+    List<WorkContractBorrowMessage> findMessageList(@Param("id") String id);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/mapper/WorkContractBorrowMessageMapper.java

@@ -0,0 +1,9 @@
+package com.jeeplus.test.workContract.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jeeplus.test.workContract.domain.WorkContractBorrow;
+import com.jeeplus.test.workContract.domain.WorkContractBorrowMessage;
+import org.apache.ibatis.annotations.Param;
+
+public interface WorkContractBorrowMessageMapper extends BaseMapper<WorkContractBorrowMessage> {
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/mapper/xml/WorkContractBorrowMapper.xml

@@ -3,10 +3,45 @@
 <mapper namespace="com.jeeplus.test.workContract.mapper.WorkContractBorrowMapper">
 
 	<update id="updateStatusById">
-		UPDATE work_contract_borrow SET borrow_type = #{filedType}, filed_data = NOW() WHERE del_flag = 0 AND contract_info_id = #{id}
+		UPDATE work_contract_borrow SET borrow_type = #{borrowType} WHERE del_flag = 0 AND id = #{id}
+	</update>
+
+	<update id="updateStatusByContractInfoId">
+		UPDATE work_contract_borrow SET borrow_type = #{borrowType} WHERE del_flag = 0 AND contract_info_id = #{id}
 	</update>
 
 	<select id="selectFileByContractInfoId" resultType="com.jeeplus.test.workContract.domain.WorkContractBorrow">
 		SELECT * FROM `work_contract_borrow` WHERE del_flag = 0 AND contract_info_id = #{id}
 	</select>
+
+	<update id="updateMessageByBorrowId">
+		UPDATE work_contract_borrow_message SET borrow_type = #{borrowType}
+		 <if test="type != null and type != ''">
+			 ,reture_data = NOW()
+		 </if>
+		 WHERE del_flag = 0 AND contract_borrow_id = #{id} order by create_date desc limit 1
+	</update>
+
+	<update id="deleteMessageById">
+		UPDATE work_contract_borrow_message SET del_flag = 1
+		WHERE del_flag = 0 AND contract_borrow_id = #{id} order by create_date desc limit 1
+	</update>
+
+	<select id="findMessageList" resultType="com.jeeplus.test.workContract.domain.WorkContractBorrowMessage">
+		SELECT
+			id,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			del_flag,
+			contract_borrow_id,
+			name,
+			borrow_name,
+			DATE_FORMAT(borrow_data,'%Y-%m-%d') as borrow_data,
+			DATE_FORMAT(borrow_ret_data,'%Y-%m-%d') as borrow_ret_data,
+			borrow_type,
+			DATE_FORMAT(reture_data,'%Y-%m-%d') as reture_data
+		 FROM work_contract_borrow_message WHERE del_flag = 0 AND contract_borrow_id = #{id}
+	</select>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/mapper/xml/WorkContractInfoMapper.xml

@@ -28,7 +28,7 @@
 			a.remarks,
 			a.filed_by,
 			a.filed_date,
-			a.filed_no,
+			d.filed_no,
 			d.confirm_filed_no,
 			a.filed_remarks,
 			a.proc_ins_id,

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/service/WorkContractBorrowService.java

@@ -0,0 +1,155 @@
+package com.jeeplus.test.workContract.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jeeplus.sys.service.dto.UserDTO;
+import com.jeeplus.sys.utils.StringUtils;
+import com.jeeplus.sys.utils.UserUtils;
+import com.jeeplus.test.workContract.domain.WorkContractBorrow;
+import com.jeeplus.test.workContract.domain.WorkContractBorrowMessage;
+import com.jeeplus.test.workContract.domain.WorkContractFile;
+import com.jeeplus.test.workContract.mapper.WorkContractBorrowMapper;
+import com.jeeplus.test.workContract.mapper.WorkContractBorrowMessageMapper;
+import com.jeeplus.test.workContract.mapper.WorkContractFileMapper;
+import com.jeeplus.test.workContract.service.dto.WorkContractBorrowDto;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class WorkContractBorrowService {
+
+    @Resource
+    private WorkContractBorrowMapper workContractBorrowMapper;
+
+    @Resource
+    private WorkContractBorrowMessageMapper workContractBorrowMessageMapper;
+
+    public String saveInfo(WorkContractBorrowDto workContractBorrowDto) throws Exception {
+        if (StringUtils.isNotEmpty(workContractBorrowDto.getId())) {
+            WorkContractBorrow info = workContractBorrowMapper.selectFileByContractInfoId(workContractBorrowDto.getId());
+            if (info != null) {
+                return update(workContractBorrowDto, info.getId());
+            }
+        }
+        return add(workContractBorrowDto);
+    }
+
+    /**
+     * 合同登记借用新增
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public String add(WorkContractBorrowDto workContractBorrowDto) throws Exception{
+        //获取当前登录人信息
+        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        String id = UUID.randomUUID().toString().replace("-", "");
+        WorkContractBorrow borrow = new WorkContractBorrow();
+        BeanUtils.copyProperties(workContractBorrowDto, borrow);
+        borrow.setId(id);
+        borrow.setCreateBy(userDTO.getId());
+        borrow.setCreateDate(new Date());
+        borrow.setUpdateBy(userDTO.getId());
+        borrow.setUpdateDate(new Date());
+        workContractBorrowMapper.insert(borrow);
+        //借用记录信息
+        this.saveMessage(workContractBorrowDto, id);
+        return id;
+    }
+
+    /**
+     * 合同登记修改
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public String update(WorkContractBorrowDto workContractBorrowDto, String id) {
+        //获取当前登录人信息
+        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        WorkContractBorrow borrow = new WorkContractBorrow();
+        BeanUtils.copyProperties(workContractBorrowDto, borrow);
+        borrow.setId(id);
+        borrow.setUpdateBy(userDTO.getId());
+        borrow.setUpdateDate(new Date());
+        workContractBorrowMapper.updateById(borrow);
+        //借用记录信息
+        this.saveMessage(workContractBorrowDto,id);
+        return borrow.getContractInfoId();
+    }
+
+    /**
+     * 根据id修改status
+     */
+    public void updateStatusById(WorkContractBorrowDto workContractBorrowDto) {
+        workContractBorrowMapper.updateStatusById(workContractBorrowDto.getId(), workContractBorrowDto.getBorrowType());
+    }
+
+    public void updateStatusByContractInfoId(WorkContractBorrowDto workContractBorrowDto) {
+        workContractBorrowMapper.updateStatusByContractInfoId(workContractBorrowDto.getId(), workContractBorrowDto.getBorrowType());
+    }
+
+    public WorkContractBorrow findById(String id) {
+        WorkContractBorrow borrow = workContractBorrowMapper.selectById(id);
+        if (borrow == null) {
+            LambdaQueryWrapper<WorkContractBorrow> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(WorkContractBorrow::getContractInfoId, id);
+            return workContractBorrowMapper.selectOne(wrapper);
+        }
+        return borrow;
+    }
+
+    public WorkContractBorrow findByContractInfoId(String id) {
+        return workContractBorrowMapper.selectFileByContractInfoId(id);
+    }
+
+    /**
+     * 借用记录保存
+     * @param workContractBorrowDto
+     * @param id
+     * @return
+     */
+    public void saveMessage (WorkContractBorrowDto workContractBorrowDto, String id) {
+        //保存借用信息
+        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        WorkContractBorrowMessage message = new WorkContractBorrowMessage();
+        BeanUtils.copyProperties(workContractBorrowDto, message);
+        String messageId = UUID.randomUUID().toString().replace("-", "");
+        message.setId(messageId);
+        message.setCreateBy(userDTO.getId());
+        message.setCreateDate(new Date());
+        message.setUpdateBy(userDTO.getId());
+        message.setUpdateDate(new Date());
+        message.setContractBorrowId(id);
+        message.setBorrowType("3");
+        workContractBorrowMessageMapper.insert(message);
+    }
+
+    /**
+     * 根据contractBorrowId修改borrowType
+     */
+    public void updateMessageByBorrowId(WorkContractBorrowDto workContractBorrowDto, String type) {
+        if ("reture".equals(type)) {
+            workContractBorrowMapper.updateMessageByBorrowId(workContractBorrowDto.getId(), workContractBorrowDto.getBorrowType(), type);
+        } else {
+            workContractBorrowMapper.updateMessageByBorrowId(workContractBorrowDto.getId(), workContractBorrowDto.getBorrowType(), null);
+        }
+    }
+
+    public void deleteById(String id) {
+        LambdaQueryWrapper<WorkContractBorrow> wrapper = new LambdaQueryWrapper<WorkContractBorrow>();
+        wrapper.eq(WorkContractBorrow::getContractInfoId, id);
+        WorkContractBorrow borrow = workContractBorrowMapper.selectOne(wrapper);
+        if (borrow != null) {
+            workContractBorrowMapper.deleteMessageById(borrow.getId());
+        }
+    }
+
+    public List<WorkContractBorrowMessage> findMessageList(String id) {
+        WorkContractBorrow borrow = findByContractInfoId(id);
+        if (borrow != null) {
+            return workContractBorrowMapper.findMessageList(borrow.getId());
+        }
+        return null;
+    }
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/service/dto/WorkContractBorrowDto.java

@@ -22,10 +22,12 @@ public class WorkContractBorrowDto extends BaseDTO {
 
     private String borrowData;
 
-    private String borrowRetureData;
+    private String borrowRetData;
 
     private String remarks;
 
     private String borrowType;
 
+    private String type;
+
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/service/dto/WorkContractBorrowService.java

@@ -1,83 +0,0 @@
-package com.jeeplus.test.workContract.service.dto;
-
-import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.StringUtils;
-import com.jeeplus.sys.utils.UserUtils;
-import com.jeeplus.test.workContract.domain.WorkContractBorrow;
-import com.jeeplus.test.workContract.domain.WorkContractFile;
-import com.jeeplus.test.workContract.mapper.WorkContractBorrowMapper;
-import com.jeeplus.test.workContract.mapper.WorkContractFileMapper;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.UUID;
-
-@Service
-public class WorkContractBorrowService {
-
-    @Resource
-    private WorkContractBorrowMapper workContractBorrowMapper;
-
-    public String saveInfo(WorkContractBorrowDto workContractBorrowDto) throws Exception {
-        if (StringUtils.isNotEmpty(workContractBorrowDto.getId())) {
-            WorkContractBorrow info = workContractBorrowMapper.selectFileByContractInfoId(workContractBorrowDto.getId());
-            if (info != null) {
-                return update(workContractBorrowDto, info.getId());
-            }
-        }
-        return add(workContractBorrowDto);
-    }
-
-    /**
-     * 合同登记新增
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public String add(WorkContractBorrowDto workContractBorrowDto) throws Exception{
-        //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
-        String id = UUID.randomUUID().toString().replace("-", "");
-        WorkContractBorrow borrow = new WorkContractBorrow();
-        BeanUtils.copyProperties(workContractBorrowDto, borrow);
-        borrow.setId(id);
-        borrow.setCreateBy(userDTO.getId());
-        borrow.setCreateDate(new Date());
-        borrow.setUpdateBy(userDTO.getId());
-        borrow.setUpdateDate(new Date());
-        workContractBorrowMapper.insert(borrow);
-        return id;
-    }
-
-    /**
-     * 合同登记修改
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public String update(WorkContractBorrowDto workContractBorrowDto, String id) {
-        //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
-        WorkContractBorrow borrow = new WorkContractBorrow();
-        BeanUtils.copyProperties(workContractBorrowDto, borrow);
-        borrow.setId(id);
-        borrow.setUpdateBy(userDTO.getId());
-        borrow.setUpdateDate(new Date());
-        workContractBorrowMapper.updateById(borrow);
-        return borrow.getContractInfoId();
-    }
-
-    /**
-     * 根据id修改status
-     */
-    public void updateStatusById(WorkContractBorrowDto workContractBorrowDto) {
-        workContractBorrowMapper.updateStatusById(workContractBorrowDto.getId(), workContractBorrowDto.getBorrowType());
-    }
-
-    public WorkContractBorrow findById(String id) {
-        return workContractBorrowMapper.selectById(id);
-    }
-
-    public WorkContractBorrow findByContractInfoId(String id) {
-        return workContractBorrowMapper.selectFileByContractInfoId(id);
-    }
-}