前端页面修改物资上报

src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -2574,7 +2574,8 @@ public class ActTaskService extends BaseService {
         String taskDefKey = act.getTaskDefKey();
         // 提交流程任务
         Map<String, Object> vars = Maps.newHashMap();
-        vars.put("person", "shenc2");
+        String loginName = UserUtils.getByUserName("沈忱").getLoginName();
+        vars.put("person", loginName);
         //保存物料上报流程信息
         MaterialReport materialReport = new MaterialReport();
         materialReport.setProjectName(reserveName);
@@ -2599,7 +2600,7 @@ public class ActTaskService extends BaseService {
      * @param act
      */
     @Transactional(readOnly = false)
-    public void materialReportBillOff(Act act) {
+    public Boolean materialReportBillOff(Act act) {
         // 设置意见
         act.setComment(("yes".equals(act.getFlag()) ? "[同意] " : "[驳回] ") + act.getComment());
         act.preUpdate();
@@ -2634,8 +2635,15 @@ public class ActTaskService extends BaseService {
             materialInfo.preInsert();
             materialInfos.add(materialInfo);
         }
+
         materialProject = new MaterialProject();
         materialProject.setReserveProjectName(reserveProjectName);
+        if (reserveProjectName!=""){
+            List<MaterialProject> list = materialProjectMapper.findJugdeReserve(materialProject);
+            if (list.size() > 0){
+                return true;
+            }
+        }
         materialProject.preInsert();
         materialProjects.add(materialProject);
         ////添加年度物料上报统计
@@ -2646,6 +2654,8 @@ public class ActTaskService extends BaseService {
         materialInfoMapper.insertOldList(materialInfos);
         //根据流程删除临时表
         pickIngService.deleteProcInsIdMaterialReport(act.getProcInsId());
+
+        return false;
     }
 
     /**

src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -31,6 +31,8 @@ import com.jeeplus.modules.sg.managementcenter.activiti.service.ProcessPersonnel
 import com.jeeplus.modules.sg.managementcenter.activiti.service.UploadImagesService;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
 import com.jeeplus.modules.sg.managementcenter.constructionProject.entity.ConstructionProject;
+import com.jeeplus.modules.sg.managementcenter.materialproject.entity.MaterialProject;
+import com.jeeplus.modules.sg.managementcenter.materialproject.service.MaterialProjectService;
 import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
 import com.jeeplus.modules.sg.materialmodule.activiti.service.MaterialModuleService;
 import com.jeeplus.modules.sg.picking.activiti.entity.PickApplication;
@@ -128,6 +130,9 @@ public class ActTaskController extends BaseController {
     @Autowired
     private SettActiviService settActiviService;
 
+    @Autowired
+    private MaterialProjectService materialProjectService;
+
 
     /**
      * 获取待办列表
@@ -1356,6 +1361,16 @@ public class ActTaskController extends BaseController {
     public AjaxJson materialReport(Act act, String selectNumber,String reserveName) {
         AjaxJson j = new AjaxJson();
         try {
+            if (null!=reserveName&&reserveName!=""){
+                MaterialProject materialProject = new MaterialProject();
+                materialProject.setReserveProjectName(reserveName);
+                List<MaterialProject> list = materialProjectService.findJugdeReserve(materialProject);
+                if (list.size() > 0){
+                    j.setMsg("项目名称不能重复");
+                    j.setSuccess(false);
+                    return j;
+                }
+            }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
             act.setComment(comment);
             actTaskService.materialReport(act,selectNumber,reserveName);
@@ -1374,7 +1389,12 @@ public class ActTaskController extends BaseController {
         try {
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
             act.setComment(comment);
-            actTaskService.materialReportBillOff(act);
+            Boolean aBoolean = actTaskService.materialReportBillOff(act);
+            if (aBoolean){
+                j.setSuccess(false);
+                j.setMsg("项目名称已存在，请联系流程发起人");
+                return j;
+            }
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }