合同编码：按办事处生成每个都从办事处编码+日期+00001开始递增；WZ260500001 ZT260500001

@@ -17,7 +17,6 @@ import com.lframework.starter.web.inner.entity.SysDataDicItem;
 import com.lframework.starter.web.inner.entity.SysDept;
 import com.lframework.starter.web.inner.entity.SysUser;
 import com.lframework.starter.web.inner.service.DicCityService;
-import com.lframework.starter.web.inner.service.GenerateCodeService;
 import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
 import com.lframework.starter.web.inner.service.system.SysDeptService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
@@ -30,7 +29,6 @@ import com.lframework.xingyun.sc.bo.contract.GetContractDistributorLineBo;
 import com.lframework.xingyun.sc.bo.contract.GetContractDistributorStandardBo;
 import com.lframework.xingyun.sc.bo.contract.GetContractStdProcessingLineBo;
 import com.lframework.xingyun.sc.bo.contract.QueryContractDistributorStandardBo;
-import com.lframework.xingyun.sc.components.code.GenerateCodeTypePool;
 import com.lframework.xingyun.sc.entity.*;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorLineService;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
@@ -105,8 +103,6 @@ public class ContractDistributorStandardController extends DefaultBaseController
     @Autowired
     private SysDataDicItemService sysDataDicItemService;
     @Autowired
-    private GenerateCodeService generateCodeService;
-    @Autowired
     private DicCityService dicCityService;
     @Autowired
     private WorkshopService workshopService;
@@ -474,10 +470,9 @@ public class ContractDistributorStandardController extends DefaultBaseController
         }
 
         Wrapper<ContractDistributorStandard> checkWrapper = Wrappers.lambdaQuery(ContractDistributorStandard.class)
-                .eq(ContractDistributorStandard::getCode, vo.getCode())
-                .eq(ContractDistributorStandard::getType, vo.getType());
+                .eq(ContractDistributorStandard::getCode, vo.getCode());
         if (contractDistributorStandardService.count(checkWrapper) > 0) {
-            throw new DefaultClientException("编号重复，请重新输入！");
+            throw new DefaultClientException("编号重复，请重新获取！");
         }
 
 
@@ -524,40 +519,28 @@ public class ContractDistributorStandardController extends DefaultBaseController
     @ApiOperation("获取code")
     @GetMapping("/code")
     public InvokeResult<String> code() {
-        StringBuilder stringBuilder = new StringBuilder();
-        // 获取当前人员及所在部门
         String currentUserId = SecurityUtil.getCurrentUser().getId();
         SysUser sysUser = sysUserService.findById(currentUserId);
-        if (sysUser != null) {
-            GetSysUserBo getSysUserBo = new GetSysUserBo(sysUser);
-            //部门
-            List<String> depts = getSysUserBo.getDepts();
-            if (CollectionUtils.isNotEmpty(depts)) {
-                String deptId = depts.get(0);
-                SysDept sysDept = sysDeptService.findById(deptId);
-                if (sysDept.getCode().equals("BF") || sysDept.getCode().equals("CZ")
-                        || sysDept.getCode().equals("DG") || sysDept.getCode().equals("FS")
-                        || sysDept.getCode().equals("NB") || sysDept.getCode().equals("SZ")
-                        || sysDept.getCode().equals("WM") || sysDept.getCode().equals("WZ")
-                        || sysDept.getCode().equals("ZT")) { //获取办事处code
-                    stringBuilder.append(sysDept.getCode());
-                } else {
-                    SysDept parentSysDept = sysDeptService.findById(sysDept.getParentId());
-                    if (parentSysDept != null && (parentSysDept.getCode().equals("BF") || parentSysDept.getCode().equals("CZ")
-                            || parentSysDept.getCode().equals("DG") || parentSysDept.getCode().equals("FS")
-                            || parentSysDept.getCode().equals("NB") || parentSysDept.getCode().equals("SZ")
-                            || parentSysDept.getCode().equals("WM") || parentSysDept.getCode().equals("WZ")
-                            || parentSysDept.getCode().equals("ZT"))) {
-                        stringBuilder.append(parentSysDept.getCode());
-                    } else {
-                        stringBuilder.append(sysDept.getCode());
-                    }
-                }
-            }
+        String officeCode = resolveOfficeCodeByUser(sysUser);
+        if (StringUtils.isBlank(officeCode)) {
+            throw new DefaultClientException("当前用不属于九大办事处，无法生成合同编号！");
         }
 
-        stringBuilder.append(generateCodeService.generate(GenerateCodeTypePool.CONTRACT));
-        return InvokeResultBuilder.success(stringBuilder.toString());
+        String monthCode = LocalDate.now().format(DateTimeFormatter.ofPattern("yyMM"));
+        String prefix = officeCode + monthCode;
+
+        Wrapper<ContractDistributorStandard> wrapper = Wrappers.lambdaQuery(ContractDistributorStandard.class)
+                .select(ContractDistributorStandard::getCode)
+                .likeRight(ContractDistributorStandard::getCode, prefix);
+        List<ContractDistributorStandard> contractList = contractDistributorStandardService.list(wrapper);
+        int nextSeq = contractList.stream()
+                .map(ContractDistributorStandard::getCode)
+                .map(code -> extractContractSequence(code, prefix))
+                .filter(Objects::nonNull)
+                .max(Integer::compareTo)
+                .orElse(0) + 1;
+
+        return InvokeResultBuilder.success(prefix + String.format("%05d", nextSeq));
     }
 
     /**
@@ -1475,6 +1458,19 @@ public class ContractDistributorStandardController extends DefaultBaseController
         return landlineDicItem == null || StringUtils.isBlank(landlineDicItem.getName()) ? "" : landlineDicItem.getName();
     }
 
+    private String resolveOfficeCodeByUser(SysUser user) {
+        if (user == null) {
+            return "";
+        }
+
+        GetSysUserBo getSysUserBo = new GetSysUserBo(user);
+        List<String> depts = getSysUserBo.getDepts();
+        if (CollectionUtils.isEmpty(depts)) {
+            return "";
+        }
+        return resolveOfficeCode(depts.get(0));
+    }
+
     private String resolveOfficeCode(String deptId) {
         if (StringUtils.isBlank(deptId)) {
             return "";
@@ -1504,6 +1500,18 @@ public class ContractDistributorStandardController extends DefaultBaseController
         return StringUtils.defaultString(officeLandline);
     }
 
+    private Integer extractContractSequence(String code, String prefix) {
+        if (StringUtils.isBlank(code) || !StringUtils.startsWith(code, prefix)) {
+            return null;
+        }
+
+        String suffix = StringUtils.substring(code, prefix.length());
+        if (StringUtils.length(suffix) != 5 || !StringUtils.isNumeric(suffix)) {
+            return null;
+        }
+        return Integer.parseInt(suffix);
+    }
+
     private File convertExcelToPdf(File excelFile) throws IOException, InterruptedException {
         if (!excelFile.exists()) {
             throw new IllegalArgumentException("Excel 文件不存在: " + excelFile.getAbsolutePath());