PSSR控制器及界面优化

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrHygieneController.java

@@ -265,6 +265,7 @@ public class TPssrHygieneController extends BaseController {
         if (tPssrHygiene.getConfirm1().equals(tPssrHygiene.getConfirm2())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
+        tPssrFileService.updateFileRelevance(tPssrHygiene.getFileIds(), "xcws", tPssrHygiene.getId(), tPssrHygiene.getSubId());
         return toAjax(tPssrHygieneService.updateTPssrHygiene(tPssrHygiene));
     }
 

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMaterialController.java

@@ -234,7 +234,7 @@ public class TPssrMaterialController extends BaseController {
             title4.createCell(4);
             try {
                 SysUser sysUser = sysUserService.selectUserById(Long.valueOf(list1.get(0).getConfirm1()));
-                String confirm =  sysUser.getSignUrl();
+                String confirm = sysUser.getSignUrl();
                 ExcelUtils.insertPicture(wb, sheet, confirm, rowIndex, 4, 0.25, 1);
             } catch (NumberFormatException e) {
                 throw new RuntimeException(e);
@@ -257,7 +257,7 @@ public class TPssrMaterialController extends BaseController {
             }
             rowIndex++;
 
-            filename = "PSSR_19_原辅料"  + ".xlsx";
+            filename = "PSSR_19_原辅料" + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();
@@ -275,8 +275,8 @@ public class TPssrMaterialController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrMaterial item = tPssrMaterialService.selectTPssrMaterialById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "yfl"));
-            if (item.getApproveStatus() != 2)
-                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "yfl"));
+        if (item.getApproveStatus() != 2)
+            item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "yfl"));
         return AjaxResult.success(item);
     }
 
@@ -287,7 +287,7 @@ public class TPssrMaterialController extends BaseController {
     @Log(title = "原料", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrMaterial tPssrMaterial) {
-        if (StringUtils.isNotEmpty(tPssrMaterial.getConfirm1())&&tPssrMaterial.getConfirm1().equals(tPssrMaterial.getConfirm2())) {
+        if (StringUtils.isNotEmpty(tPssrMaterial.getConfirm1()) && tPssrMaterial.getConfirm1().equals(tPssrMaterial.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         return toAjax(tPssrMaterialService.insertTPssrMaterial(tPssrMaterial));
@@ -300,7 +300,7 @@ public class TPssrMaterialController extends BaseController {
     @Log(title = "原料", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrMaterial tPssrMaterial) {
-        if (tPssrMaterial.getConfirm1().equals(tPssrMaterial.getConfirm2())){
+        if (tPssrMaterial.getConfirm1().equals(tPssrMaterial.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrFileService.updateFileRelevance(tPssrMaterial.getFileIds(), "yfl", tPssrMaterial.getId(), tPssrMaterial.getSubId());
@@ -314,7 +314,7 @@ public class TPssrMaterialController extends BaseController {
     @Log(title = "原料", businessType = BusinessType.UPDATE)
     @PutMapping("editBatch")
     public AjaxResult editBatch(@RequestBody TPssrMaterial tPssrMaterial) {
-        if (tPssrMaterial.getConfirm1().equals(tPssrMaterial.getConfirm2())){
+        if (tPssrMaterial.getConfirm1().equals(tPssrMaterial.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         return toAjax(tPssrMaterialMapper.updateTPssrMaterialByIds(tPssrMaterial));
@@ -343,9 +343,7 @@ public class TPssrMaterialController extends BaseController {
         if (tPssrMaterial.getIds() != null && tPssrMaterial.getIds().length > 0) {
             for (Long id : tPssrMaterial.getIds()) {
                 material = tPssrMaterialService.selectTPssrMaterialById(id);
-                if (material.getConfirmationDate() == null) {
-                    material.setConfirmationDate(new Date());
-                }
+                material.setConfirmationDate(new Date());
                 material.setApproveStatus(2L);
                 material.setUpdatedate(new Date());
                 material.setUpdaterCode(String.valueOf(getUserId()));
@@ -355,9 +353,7 @@ public class TPssrMaterialController extends BaseController {
             material.setSubId(tPssrMaterial.getSubId());
             material.setApproveStatus(1L);
             for (TPssrMaterial item : tPssrMaterialService.selectTPssrMaterialList(material)) {
-                if (tPssrMaterial.getTaskType() == 5) {
-                    item.setConfirmationDate(new Date());
-                }
+                item.setConfirmationDate(new Date());
                 item.setApproveStatus(2L);
                 item.setUpdatedate(new Date());
                 item.setUpdaterCode(String.valueOf(getUserId()));
@@ -371,16 +367,8 @@ public class TPssrMaterialController extends BaseController {
         TPssrMaterial Material = tPssrMaterialService.selectAllConfirmedPersonBySubId(entity);
         if (Material != null) {
             //如果当前用户还有待审批任务
-            if (tPssrMaterial.getTaskType() == 4 && StringUtils.isNotEmpty(Material.getConfirm1())) {
-                if (Material.getConfirm1().contains(getUserId().toString())) {
-                    return AjaxResult.success();
-                }
-            }
-
-            if (tPssrMaterial.getTaskType() == 5 && StringUtils.isNotEmpty(Material.getConfirm2())) {
-                if (Material.getConfirm2().contains(getUserId().toString())) {
-                    return AjaxResult.success();
-                }
+            if (Material.getConfirm1().contains(getUserId().toString())) {
+                return AjaxResult.success();
             }
         }
         //无待审批任务结束当前用户流程

ui/src/views/pssr/pipe/index.vue

@@ -203,7 +203,7 @@
       </u-table-column>
       <u-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <u-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <u-table-column label="操作" align="center" fixed="right" width="120" v-if="isApprove==0" class-name="small-padding fixed-width">
+      <u-table-column label="操作" align="center" fixed="right"  v-if="isApprove==0" class-name="small-padding" width="200">
         <template slot-scope="scope">
           <el-button
             size="mini"

ui/src/views/pssr/safetyValve/index.vue

@@ -182,8 +182,7 @@
       </u-table-column>
       <u-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <u-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="180"/>
-      <u-table-column label="操作" align="center" fixed="right" width="120" v-if="isApprove==0"
-                       class-name="small-padding fixed-width">
+      <u-table-column label="操作" align="center" fixed="right"  v-if="isApprove==0" class-name="small-padding" width="200">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -198,7 +197,6 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['pssr:safetyValve:edit']"
           >修改
           </el-button>
           <el-button
@@ -206,7 +204,6 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['pssr:safetyValve:remove']"
           >删除
           </el-button>
         </template>