diff --git a/inventory-gov/src/main/java/com/rzyc/controller/DataController.java b/inventory-gov/src/main/java/com/rzyc/controller/DataController.java index a721bb8..57cd7ec 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/DataController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/DataController.java @@ -762,7 +762,7 @@ public class DataController extends com.rzyc.controller.BaseController { System.out.println("责任人 -》 "+performNameMap.get(entry.getKey())); System.out.println("职责清单 -》 "+JSONArray.toJSONString(dutyMap.get(entry.getKey()))); String[] strs = entry.getKey().split("---"); - ListPerform superPerform = listPerformMapper.findByName(strs[0],"5bd164aa-dd43-45e3-a5a2-649bb2fd9fb9"); + ListPerform superPerform = listPerformMapper.findByName(strs[0],""); if(null != superPerform){ ListPerform listPerform = new ListPerform(); listPerform.setListperformid(RandomNumber.getUUid()); @@ -908,7 +908,7 @@ public class DataController extends com.rzyc.controller.BaseController { cell = row.getCell((short)7); frequency = dataFormatter.formatCellValue(cell); - if(null != frequency){ + if(StringUtils.isBlank(frequency)){ frequency = 1+""; } @@ -945,7 +945,7 @@ public class DataController extends com.rzyc.controller.BaseController { System.out.println("frequency -------> "+TypeConversion.StringToInteger(frequency)); - ListPerform superPerform = listPerformMapper.findByName(unitName,"5bd164aa-dd43-45e3-a5a2-649bb2fd9fb9"); + ListPerform superPerform = listPerformMapper.findByName(unitName,""); if(null != superPerform){ ListPerform listPerform = listPerformMapper.findBySortId(postName,superPerform.getListperformid(),TypeConversion.StringToInteger(sortStr)); if(null != listPerform){ @@ -954,7 +954,7 @@ public class DataController extends com.rzyc.controller.BaseController { listFactor.setListperformid(listPerform.getListperformid()); listFactor.setListnum(1+""); listFactor.setSortid(i); - listFactor.setSysyear("2022"); + listFactor.setSysyear("2023"); listFactor.setType(4); listFactor.setFactorcnt(performList); listFactor.setCheckstandard(checkstandard);