材料确认单修改部分代码

src/main/java/com/jeeplus/modules/projectAccessory/web/ProjectAccessoryController.java

@@ -21,11 +21,8 @@ import com.jeeplus.modules.projectAccessory.service.CollectAccessoryService;
 import com.jeeplus.modules.projectAccessory.service.ProjectAccessoryService;
 import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
 import com.jeeplus.modules.projectEngineering.service.ProjectEngineeringService;
-import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectBasedDataService;
-import com.jeeplus.modules.projectmaterialstorage.entity.ProjectMaterialStorage;
 import com.jeeplus.modules.projectmaterialstorage.service.ProjectMaterialStorageService;
-import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.ruralprojectrecords.web.RuralProjectRecordsController;
@@ -34,8 +31,6 @@ import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
-import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
-import io.netty.util.internal.UnstableApi;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -449,6 +444,7 @@ public class ProjectAccessoryController extends BaseController {
 			map.put("str","");
 		}
 
+		//cf70486864254239b3533eba5c19c19e 材料确认单id  （强耦合）
 		if("cf70486864254239b3533eba5c19c19e".equals(projectAccessory.getId())) {
 			RuralProjectRecords ruralProjectRecords =  ruralProjectRecordsController.get(projectAccessory.getProjectId());
 			Workattachment workattachment1 = new Workattachment();

src/main/java/com/jeeplus/modules/sys/web/WorkattachmentController.java

@@ -17,7 +17,6 @@ import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.projectmaterialstorage.service.ProjectMaterialStorageService;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
-import com.jeeplus.modules.ruralprojectrecords.web.RuralProjectRecordsController;
 import com.jeeplus.modules.sys.entity.Workattachment;
 import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.UserUtils;
@@ -25,7 +24,6 @@ import com.jeeplus.modules.utils.SftpClientUtil;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.method.P;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
@@ -267,6 +265,7 @@ public class WorkattachmentController extends BaseController {
 			map.put("str","success");
 
 		if(StringUtils.isNotBlank(workAttachment1.getProjectId())){
+				//cf70486864254239b3533eba5c19c19e 材料确认单id  （强耦合）
 				if("cf70486864254239b3533eba5c19c19e".equals(workAttachment1.getAttachmentId())){
 				RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(workAttachment1.getProjectId());
 				if(workattachmentService.queryMaterialListFile(workAttachment1) != 0){

src/main/webapp/static/common/jeeplus.js

@@ -526,8 +526,8 @@ function getProjectMaterialStorageStatus(id)
     switch(id)
     {
         case "0":result.label = "tempstore";result.status="无文件";result.action = false;break;
-        case "1":result.label = "tempstore";result.status="有文件";result.action = false;break;
-        case "2":result.label = "auditing";result.status="已处理";break;
+        case "1":result.label = "auditing";result.status="有文件";result.action = false;break;
+        case "2":result.label = "signed";result.status="已处理";result.action = false;break;
         default:
             result.label = "unknown";result.status="未知";break;
     }