任务

pcbms/src/main/java/com/hssx/pcbms/constant/Constant.java

@@ -28,7 +28,7 @@ public class Constant {
     public static final String ALREADY_DISTRIBUTED= "已派发";
     public static final String ALREADY_ACCEPT= "已接受";
     public static final String TASK_ACCEPTED= "已接受任务";
-    public static final String ALREADY_DELAY= "已逾期";
+    public static final String ALREADY_DELAY= "已延期";
     public static final String ALREADY_INVALID= "已失效";
     public static final String TASK_COMPLETED= "已完成";
     public static final String TASK_NO_PASS= "未通过";

pcbms/src/main/java/com/hssx/pcbms/entity/vo/GoodsVO.java

@@ -17,15 +17,6 @@ public class GoodsVO extends Goods {
     private Integer number = 0;//数量
     private String deptStr;//部门编号
     private String goodStr;//产品编号
-    /**
-     * 用于比较的部门代码
-     */
-    private String divisionCode;
-
-    /**
-     * 用于比较的前缀代码
-     */
-    private String suffixCode;
     private List<GoodsNo> goodsNos;
     private List<GoodsNoVO> goodsNosVO;
     private Integer userId;

pcbms/src/main/java/com/hssx/pcbms/service/impl/TaskExamineServiceImpl.java

@@ -44,12 +44,12 @@ public class TaskExamineServiceImpl extends ServiceImpl<TaskExamineMapper, TaskE
     public HttpRespMsg addOrUpdate(TaskExamine taskExamine, Integer type) {
         HttpRespMsg msg = new HttpRespMsg();
         TaskDynamic dynamic = new TaskDynamic();
-        dynamic.setTaskId(taskExamine.getTaskId());
         Task task = new Task();
         if (taskExamine.getId() == null) {
             //添加操作
             taskExamine.setPublisher(userMapper.selectById(taskExamine.getPublisherId()).getName());
             taskExamineMapper.insert(taskExamine);
+            dynamic.setTaskId(taskExamine.getTaskId());
             //添加动态
             dynamic.setTaskState(3);
             dynamic.setContent(taskExamine.getPublisher()+Constant.EXAMINE_SUBMIT);
@@ -65,6 +65,7 @@ public class TaskExamineServiceImpl extends ServiceImpl<TaskExamineMapper, TaskE
             taskExamineMapper.updateById(taskExamine);
             TaskExamine newTaskExamine = taskExamineMapper.selectById(taskExamine.getId());
             task.setId(newTaskExamine.getTaskId());
+            dynamic.setTaskId(newTaskExamine.getTaskId());
             if (taskExamine.getIsPass() == 2) {
                 //添加通过任务处理动态
                 dynamic.setTaskState(5);

pcbms/src/main/java/com/hssx/pcbms/service/impl/TaskServiceImpl.java

@@ -202,6 +202,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                     TaskDynamic taskDynamic = new TaskDynamic();
                     taskDynamic.setTaskState(7);//已失效
                     taskDynamic.setStateContent(Constant.ALREADY_INVALID);
+                    taskDynamic.setTaskId(task.getId());
                     taskDynamic.setContent("[" + task.getName() + "] " + Constant.ALREADY_INVALID);
                     taskDynamicMapper.insert(taskDynamic);
                 }