f1b0082e by 荆蔚杰

补录编码生成规则bug修改

1 parent f6e6517d
...@@ -14,52 +14,50 @@ public class SysCodeUtil { ...@@ -14,52 +14,50 @@ public class SysCodeUtil {
14 14
15 /** 15 /**
16 * 编号生成规则 16 * 编号生成规则
17 *
17 * @param sysCodeVO 18 * @param sysCodeVO
18 * @return 19 * @return
19 */ 20 */
20 public String getSequence(SysCodeVO sysCodeVO){ 21 public String getSequence(SysCodeVO sysCodeVO) {
21 //1、查询数据是否存在 22 //1、查询数据是否存在
22 SysCodeDO sysCodeDO=queryInfoByCondition(sysCodeVO); 23 SysCodeDO sysCodeDO = queryInfoByCondition(sysCodeVO);
23 String taskvalue=""; 24 String taskValue;
24 if(sysCodeDO!=null){ 25 if (sysCodeDO != null) {
25 String lastString=sysCodeDO.getTaskvalue().substring(sysCodeDO.getTaskvalue().length()-Integer.valueOf(sysCodeDO.getTaskchild())); 26 String lastString = sysCodeDO.getTaskvalue().substring(2);
26 String firstString=sysCodeDO.getTaskvalue().substring(0,(sysCodeDO.getTaskvalue().length()-Integer.valueOf(sysCodeDO.getTaskchild()))); 27 int code = Integer.parseInt(lastString) + 1;
27 //2、如果存在在修改编号值 28 taskValue = "BL" + code;
28 taskvalue=firstString+Integer.valueOf(lastString)+1; 29 sysCodeDO.setTaskvalue(taskValue);
29 sysCodeDO.setTaskvalue(taskvalue);
30 sysCodeMapper.updateById(sysCodeDO); 30 sysCodeMapper.updateById(sysCodeDO);
31 }else { 31 } else {
32 //3、不存在则新增 32 //3、不存在则新增
33 SysCodeDO sysCodeDO1=new SysCodeDO(); 33 SysCodeDO newSysCode = new SysCodeDO();
34 sysCodeDO1.setCtype(sysCodeVO.getCtype()); 34 newSysCode.setCtype(sysCodeVO.getCtype());
35 sysCodeDO1.setState("1"); 35 newSysCode.setState("1");
36 sysCodeDO1.setTaskno(sysCodeVO.getTaskno()); 36 newSysCode.setTaskno(sysCodeVO.getTaskno());
37 sysCodeDO1.setTaskname(sysCodeVO.getTaskname()); 37 newSysCode.setTaskname(sysCodeVO.getTaskname());
38 taskvalue= getTaskValue(Integer.valueOf(sysCodeVO.getTaskchild())); 38 // taskValue = getTaskValue(sysCodeVO.getTaskchild());
39 sysCodeDO1.setTaskvalue(sysCodeVO.getTaskno()+taskvalue); 39 taskValue = sysCodeVO.getTaskno() + "00000";
40 sysCodeDO1.setTaskchild(sysCodeVO.getTaskchild()+""); 40 newSysCode.setTaskvalue(taskValue);
41 sysCodeMapper.insert(sysCodeDO1); 41 newSysCode.setTaskchild(sysCodeVO.getTaskchild() + "");
42 sysCodeMapper.insert(newSysCode);
42 } 43 }
43 return taskvalue; 44 return taskValue;
44 } 45 }
45 46
46 private SysCodeDO queryInfoByCondition(SysCodeVO sysCodeVO){ 47 private SysCodeDO queryInfoByCondition(SysCodeVO sysCodeVO) {
47 QueryWrapper<SysCodeDO> wrapper = new QueryWrapper<>(); 48 QueryWrapper<SysCodeDO> wrapper = new QueryWrapper<>();
48 wrapper.eq(sysCodeVO.getCtype()!=null && !"".equals(sysCodeVO.getCtype()),"CTYPE",sysCodeVO.getCtype()); 49 wrapper.lambda().eq(SysCodeDO::getCtype, sysCodeVO.getCtype()).eq(SysCodeDO::getTaskno, sysCodeVO.getTaskno()).eq(SysCodeDO::getTaskchild, sysCodeVO.getTaskchild());
49 wrapper.eq(sysCodeVO.getTaskno()!=null && !"".equals(sysCodeVO.getTaskno()),"TASKNO",sysCodeVO.getTaskno()); 50 return sysCodeMapper.selectOne(wrapper);
50 wrapper.eq("STATE","1");
51 wrapper.eq(sysCodeVO.getTaskchild()!=null && !"".equals(sysCodeVO.getTaskchild()),"TASKCHILD",sysCodeVO.getTaskchild());
52 SysCodeDO sysCodeDO=sysCodeMapper.selectOne(wrapper);
53 return sysCodeDO;
54 51
55 } 52 }
56 private String getTaskValue(int length){ 53
57 List<String> list=new ArrayList<String>(length-1); 54 private String getTaskValue(int length) {
58 String num=""; 55 List<String> list = new ArrayList<String>(length - 1);
59 for (int i = 0; i <list.size() ; i++) { 56 String num = "";
60 num+="0"; 57 for (int i = 0; i < list.size(); i++) {
58 num += "0";
61 } 59 }
62 num=num+1; 60 num = num + 1;
63 return num; 61 return num;
64 } 62 }
65 63
......