修改

jinlin

2023-12-07 497ee5e5905f1808717ffec2ee2889262d2ba90c

 zt/core/src/main/java/com/zt/modules/coderule/service/SysCodeRuleService.java

@@ -46,23 +46,24 @@
    public String getNewCode(Map<String, String> map) {
        SysCodeRule codeRule = baseDao.getCodeRule(map);
        String newCodeTemplet = codeRule.getCodeRule();
        String year = map.get("year");
        if (map.get("projectId")!=null){
            String projectIdentity = baseDao.getProjectIdentity(map.get("projectId"));
            newCodeTemplet = newCodeTemplet.replace("[项目编号]",projectIdentity);
            Map<String, String> mapProject = baseDao.getMapProjectIdentity(map.get("projectId"));
            newCodeTemplet = newCodeTemplet.replace("[项目编号]",mapProject.get("software_identity"));
            year = mapProject.get("year");
        }
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
        String year = sdf.format(new Date());
        newCodeTemplet = newCodeTemplet.replace("[年份]",year);

        String xhTemplet = StringUtils.substring("__________",0,codeRule.getNoByteNum()-1);
        String xhTemplet = StringUtils.substring("__________",0,codeRule.getNoByteNum());
        newCodeTemplet = newCodeTemplet.replace("[序号]",xhTemplet);
        int xhStartPosition = newCodeTemplet.indexOf(xhTemplet);

        String maxCode = baseDao.getMaxCode(codeRule.getTableName(),newCodeTemplet);
        String maxCodeXh = "0";
        if (StringUtils.isNotBlank(maxCode))
            maxCodeXh = StringUtils.substring(maxCode,xhStartPosition,xhStartPosition+codeRule.getNoByteNum()-1);
        String newCodeXh = String.format("%0"+codeRule.getNoByteNum()+"d", Convert.toInt(maxCodeXh)+1);
            maxCodeXh = StringUtils.substring(maxCode,xhStartPosition,xhStartPosition+codeRule.getNoByteNum());
        Integer a = Convert.toInt(maxCodeXh)+1;
        String newCodeXh = String.format("%0"+codeRule.getNoByteNum()+"d", a);
        String newCode = newCodeTemplet.replace(xhTemplet,newCodeXh);
        return newCode;
    }