From 76c38b862088ea3946cb251080c1ad82f6e1bb54 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Fri, 13 Dec 2024 10:51:34 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/contract/controller/BmContractController.java      | 2 +-
 .../material/contract/service/impl/BmContractServiceImpl.java   | 1 +
 .../resources/mapper/material/contract/BmContractMapper.xml     | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java
index f6dcc70..540a0d3 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java
@@ -52,7 +52,7 @@ public class BmContractController extends BaseController {
             return AjaxResult.error("修改失败");
         }
     }
-    @ApiOperation(value = "合同修改")
+    @ApiOperation(value = "合同删除")
     @PostMapping("/del")
     public AjaxResult del(@RequestBody BmContract bmContract) {
         Integer i = bmContractService.del(bmContract);
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java
index 430408c..5827235 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java
@@ -26,6 +26,7 @@ public class BmContractServiceImpl implements BmContractService {
 
     @Override
     public List<BmContract> list(BmContract bmContract) {
+        bmContract.setOwnerCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
         return bmContractMapper.list(bmContract);
     }
 
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml
index 25f4892..f1fbeb9 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml
@@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="list" resultType="com.bonus.material.contract.domain.BmContract">
         select id, contract_code as contractCode, contract_name as contractName, status, create_time as createTime, update_time as updateTime, owner_id as ownerId, owner_com as ownerCom from bm_contract
         <where>
+            owner_com = #{ownerCom}
             <if test="contractCode != null and contractCode != ''">
                 and contract_code like concat('%', #{contractCode}, '%')
             </if>

From 6a0c0ba5cda301170e4b972ae7170ad5ec9efac6 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Fri, 13 Dec 2024 10:59:30 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contract/mapper/BmContractMapper.java     |  4 ++++
 .../service/impl/BmContractServiceImpl.java   | 24 +++++++++++++++++++
 .../material/contract/BmContractMapper.xml    |  6 +++++
 3 files changed, 34 insertions(+)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/mapper/BmContractMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/mapper/BmContractMapper.java
index 3d497f0..7cab463 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/mapper/BmContractMapper.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/mapper/BmContractMapper.java
@@ -1,7 +1,9 @@
 package com.bonus.material.contract.mapper;
 
 import com.bonus.material.contract.domain.BmContract;
+import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -17,4 +19,6 @@ public interface BmContractMapper {
     Integer edit(BmContract bmContract);
 
     Integer del(BmContract bmContract);
+
+    String selectTaskNumByMonth(@Param("date") Date nowDate);
 }
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java
index 5827235..f1cd184 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java
@@ -2,6 +2,8 @@ package com.bonus.material.contract.service.impl;
 
 import com.bonus.common.biz.constant.MaterialConstants;
 import com.bonus.common.biz.domain.BmFileInfo;
+import com.bonus.common.core.utils.DateUtils;
+import com.bonus.common.core.utils.StringUtils;
 import com.bonus.common.security.utils.SecurityUtils;
 import com.bonus.material.contract.domain.BmContract;
 import com.bonus.material.contract.mapper.BmContractMapper;
@@ -10,6 +12,8 @@ import com.bonus.material.device.mapper.BmFileInfoMapper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -32,6 +36,7 @@ public class BmContractServiceImpl implements BmContractService {
 
     @Override
     public Integer add(BmContract bmContract) {
+        bmContract.setContractCode(getString());
         bmContract.setOwnerId(SecurityUtils.getLoginUser().getUserid());
         bmContract.setOwnerCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
         bmContract.setStatus(0);
@@ -84,4 +89,23 @@ public class BmContractServiceImpl implements BmContractService {
         }
         return del;
     }
+
+    private String getString() {
+        //根据前台传过来的数据，生成需求编号
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
+        Date nowDate = DateUtils.getNowDate();
+        String format = dateFormat.format(nowDate);
+        String taskNum = bmContractMapper.selectTaskNumByMonth(nowDate);
+        if (StringUtils.isNotBlank(taskNum)) {
+            // 将字符串转换为整数
+            int num = Integer.parseInt(taskNum);
+            // 执行加一操作
+            num++;
+            // 将结果转换回字符串格式，并确保结果是4位数，不足4位则在前面补0
+            taskNum = String.format("%04d", num);
+        } else {
+            taskNum = "0001";
+        }
+        return "HT" + format + "-" + taskNum;
+    }
 }
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml
index f1fbeb9..35dec01 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml
@@ -31,4 +31,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
     </select>
+    <select id="selectTaskNumByMonth" resultType="java.lang.String">
+        SELECT SUBSTRING(contract_code, - 4) as code
+        FROM bm_contract
+        WHERE DATE_FORMAT(create_time, '%y%m') = DATE_FORMAT(#{date}, '%y%m')
+        ORDER BY create_time DESC LIMIT 1
+    </select>
 </mapper>
\ No newline at end of file

From 14502ba6ce24d7ac44c2c2f39f70d6bb8291fe17 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Fri, 13 Dec 2024 11:19:18 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contract/service/impl/BmContractServiceImpl.java     | 9 ++++++++-
 .../mapper/material/contract/BmContractMapper.xml        | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java
index f1cd184..418aaf8 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java
@@ -31,7 +31,14 @@ public class BmContractServiceImpl implements BmContractService {
     @Override
     public List<BmContract> list(BmContract bmContract) {
         bmContract.setOwnerCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
-        return bmContractMapper.list(bmContract);
+        List<BmContract> list = bmContractMapper.list(bmContract);
+        for (BmContract contract : list) {
+            BmFileInfo bmFileInfo = new BmFileInfo();
+            bmFileInfo.setModelId(Long.valueOf(contract.getId())).setTaskType(MaterialConstants.APPENDICES_OF_CONTRACT).setFileType(0L);
+            List<BmFileInfo> bmFileInfos = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo);
+            contract.setBmFileInfoList(bmFileInfos);
+        }
+        return list;
     }
 
     @Override
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml
index 35dec01..e81efc4 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml
@@ -29,6 +29,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="contractName != null and contractName != ''">
                 and contract_name like concat('%', #{contractName}, '%')
             </if>
+            <if test="status != null">
+                and status = #{status}
+            </if>
         </where>
     </select>
     <select id="selectTaskNumByMonth" resultType="java.lang.String">