Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/material/controller/MaterialTaskController.java

@@ -108,7 +108,10 @@ public class MaterialTaskController {
                 .like(StrUtil.isNotBlank(dto.getAssignedUser()), XjrUser::getName, dto.getAssignedUser())
                 .eq(ObjectUtil.isNotEmpty(dto.getStatus()), MaterialTask::getStatus, dto.getStatus())
 //                .eq((ObjectUtil.isNotEmpty(dto.getMaterialTypeId())) && dto.getMaterialTypeId() > 0, MaterialTask::getMaterialTypeId, dto.getMaterialTypeId())
-                .eq((ObjectUtil.isNotEmpty(dto.getExtStatus())), MaterialTaskAssign::getStatus, dto.getExtStatus())
+                .eq((dto.getExtStatus() != null && dto.getExtStatus() != 1), MaterialTaskAssign::getStatus, dto.getExtStatus())
+                .and((dto.getExtStatus() != null && dto.getExtStatus() == 1),wp -> wp.eq(MaterialTaskAssign::getStatus, 1)
+                        .or()
+                        .eq(MaterialTaskAssign::getStatus, 4))
                 .select(MaterialTask::getId)
                 .select(MaterialTask.class, x -> VoToColumnUtil.fieldsToColumns(MaterialTaskWaitPageVo.class).contains(x.getProperty()))
                 .innerJoin(MaterialTaskAssign.class, MaterialTaskAssign::getMaterialTaskId, MaterialTask::getId, ext -> ext.eq(MaterialTaskAssign::getUserId, StpUtil.getLoginIdAsLong()))
@@ -118,6 +121,7 @@ public class MaterialTaskController {
                 .selectAs(MaterialTaskAssign::getTransferSubmitedPerson, MaterialTaskWaitPageVo::getTransferSubmitedPerson)
                 .selectAs(MaterialTaskAssign::getStatus, MaterialTaskWaitPageVo::getProcessStatus)
                 .leftJoin(XjrUser.class, XjrUser::getId, MaterialTask::getCreateUserId, ext -> ext.selectAs(XjrUser::getName, MaterialTaskWaitPageVo::getCreateUserName))
+                .leftJoin(MaterialTaskAppendix.class, MaterialTaskAppendix::getMaterialTaskId, MaterialTaskAssign::getId, ext -> ext.selectAs(MaterialTaskAppendix::getFileId, MaterialTaskWaitPageVo::getMaterialId))
         ;
 
 //        if (ObjectUtil.isNotNull(dto.getRequiredCompleteStareTime()) && ObjectUtil.isNotNull(dto.getRequiredCompleteEndTime())) {

src/main/java/com/xjrsoft/module/material/service/impl/MaterialTaskAssignServiceImpl.java

@@ -90,15 +90,16 @@ public class MaterialTaskAssignServiceImpl   extends MPJBaseServiceImpl<Material
                     materialTaskAssign.setOpinion(dto.getOpinion());
                     if (dto.getStatus() == 1) {
                         materialTaskAssign.setStatus(3);
-                        materialTaskAssign.setStatus(dto.getStatus() == 1 ? 3 : 4);
-                        if (dto.getExecutiveStatus() == 1) {
-                            materialTask.setOnTimePerson(materialTask.getOnTimePerson() + 1);
-                            materialTaskAssign.setExecutiveStatus(2);
-                        } else {
-                            materialTask.setTimeDelay(materialTask.getTimeDelay() + 1);
-                            materialTaskAssign.setExecutiveStatus(3);
-                        }
-                    } else {
+                        //materialTaskAssign.setStatus(dto.getStatus() == 1 ? 3 : 4);
+//                        if (dto.getExecutiveStatus() == 1) {
+//                            materialTask.setOnTimePerson(materialTask.getOnTimePerson() + 1);
+//                            materialTaskAssign.setExecutiveStatus(2);
+//                        } else {
+//                            materialTask.setTimeDelay(materialTask.getTimeDelay() + 1);
+//                            materialTaskAssign.setExecutiveStatus(3);
+//                        }
+                    }
+                    if (dto.getStatus() == 2) {
                         materialTaskAssign.setStatus(4);
                     }
 

src/main/java/com/xjrsoft/module/material/service/impl/MaterialTaskServiceImpl.java

@@ -70,7 +70,7 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
         //新增任务
         materialTask.setStatus(2);
         if(dto.getUserList() == null && !dto.getUserList().isEmpty()){
-            materialTask.setSubmitedPerson(dto.getUserList().size());
+            materialTask.setAssignPerson(dto.getUserList().size());
         }
         materialTaskMaterialTaskMapper.insert(materialTask);
         //新增任务人

src/main/java/com/xjrsoft/module/material/vo/MaterialTaskWaitPageVo.java

@@ -107,4 +107,10 @@ public class MaterialTaskWaitPageVo {
      */
     @ApiModelProperty("任务类型(可多选 xjr_dictionary_detail[material_category])")
     private String materialCategory;
+
+    /**
+     * 文件模板
+     */
+    @ApiModelProperty("文件模板")
+    private Long materialId;
 }