[业务模块]修改名称

dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java

@@ -694,8 +694,8 @@ public class AllotBillController {
         taskService.addInvolveUser(taskBto,userUtils.getCurrentUserId());
         //判断业务状态是否被操作
         List<StatusEnum> statusEnums = new ArrayList<>();
-        statusEnums.add(StatusEnum.WAIT_UPLOAD_CROSS_FILE);
-        statusEnums.add(StatusEnum.WAIT_UPLOAD_ALLOT_FILE);
+        statusEnums.add(StatusEnum.WAIT_UPLOAD_CROSS_FILE);//待上传横向配发单
+        statusEnums.add(StatusEnum.WAIT_UPLOAD_ALLOT_FILE);//待上传纵向配发单
         TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),statusEnums);
         //获取账单
         AllotBill allotBill = allotBillService.getOne(taskBto.getBillId());

dev-allot/src/main/java/com/tykj/dev/device/allot/controller/BackController.java

@@ -141,7 +141,7 @@ public class BackController {
         TaskBto saveEntity;
         //直接发起
         if (allotBillSaveVo.getTaskId()==null) {
-            TaskBto taskBto = new TaskBto(StatusEnum.ALLOT_BACKING.id, allotBillSaveVo.getSendUnit()+"发给了"+allotBillSaveVo.getReceiveUnit()+"退回业务", null, ".", billId, 22, userPublicService.findUnitIdByName(allotBillSaveVo.getReceiveUnit()), 1, null, userIds);
+            TaskBto taskBto = new TaskBto(StatusEnum.ALLOT_BACKING.id, "退回业务(对方单位)："+allotBillSaveVo.getReceiveUnit(), null, ".", billId, 22, userPublicService.findUnitIdByName(allotBillSaveVo.getReceiveUnit()), 1, null, userIds);
             saveEntity = taskService.start(taskBto);
         }
         //从草稿发起
@@ -155,7 +155,7 @@ public class BackController {
             saveEntity = taskService.moveToSpecial(taskBto1,StatusEnum.ALLOT_BACKING,0);
         }
         //生成发件方上传退回单的子任务
-        TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_BACK_FILE_2.id, "发给了"+allotBillSaveVo.getReceiveUnit()+"退回业务", saveEntity.getId(), saveEntity.getNodeIdDetail() + saveEntity.getId() + ".", saveEntity.getBillId(), 22, userPublicService.findUnitIdByName(allotBackBill1.getSendUnit()), 0, null, Collections.singletonList(0));
+        TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_BACK_FILE_2.id, "退回业务(对方单位)："+allotBillSaveVo.getReceiveUnit(), saveEntity.getId(), saveEntity.getNodeIdDetail() + saveEntity.getId() + ".", saveEntity.getBillId(), 22, userPublicService.findUnitIdByName(allotBackBill1.getSendUnit()), 0, null, Collections.singletonList(0));
         taskService.start(taskBto2);
         List<FileVo> fileVoList = new ArrayList<>();
         //存装备日志
@@ -484,7 +484,7 @@ public class BackController {
             allotBackBill.setSendUseraId(userId);
             AllotBackBill allotBackBill1 = allotBackBillService.addEntity(allotBackBill);
             //发起草稿任务
-            TaskBto taskBto = new TaskBto(StatusEnum.BACK_DRAFT.id, "退回业务", null, ".", allotBackBill1.getId(), 22, userUtils.getCurrentUnitId(), 0, null, userIds);
+            TaskBto taskBto = new TaskBto(StatusEnum.BACK_DRAFT.id, "退回业务(草稿)", null, ".", allotBackBill1.getId(), 22, userUtils.getCurrentUnitId(), 0, null, userIds);
             TaskBto taskBto1 = taskService.start(taskBto);
             //返回保存成功的id
             Integer id = taskBto1.getId();

dev-task/src/main/java/com/tykj/dev/device/task/controller/TaskController.java

@@ -124,7 +124,9 @@ public class TaskController {
         if (!hasCondition){
             List<Integer> taskIds = taskUserVos.stream().map(TaskUserVo::getId).collect(Collectors.toList());
             List<UserRecord> userRecords = userRecordDao.findAllByUserId(userId);
+            //2代表配发
             if (taskSelectVo.getSelectNum()==2) {
+                //待办类型(1:省内待办，2：省外待办)
                 if (taskSelectVo.getType() == 1) {
                     if (userRecords.isEmpty()) {
                         UserRecord userRecord = new UserRecord();

dev-union/src/main/resources/application-prod.properties

 spring.datasource.driver-class-name=com.oscar.Driver
 spring.datasource.url=jdbc:oscar://10.153.4.10:2003/OSRDB
+#spring.datasource.url=jdbc:oscar://192.168.0.80:2003/OSRDB
 spring.datasource.username=SYSDBA
 spring.datasource.password=szoscar55
 spring.jpa.database-platform=org.hibernate.dialect.OscarDialect
 file.path=/opt/zb/
 preview.path=http://10.153.4.11:8088/equip/file/
+#preview.path=http://192.168.0.80:8088/equip/file/
\ No newline at end of file