Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectrecord/enums/ProjectStatusEnum.java

@@ -9,7 +9,8 @@ public enum ProjectStatusEnum {
     INVALIDING(6,"作废中"),
     INVALID(7,"已作废"),
     ON_CHANGE(8,"变更中"),
-    DONE(9,"已完成");
+    DONE(9,"已完成"),
+    DISPENSE(10,"无需上报");
 
     private int value;
     private String desc;

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageNewService.java

@@ -2662,6 +2662,8 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                     }
                 }
             } else {
+                //获取项目信息
+                RuralProjectRecords record = ruralProjectRecordsService.get(records);
                 workActivityMenu.setProcessType("newProjectReported");
                 for (int i = 0; i < workActivityProcesses.size(); i++) {
                     WorkActivityProcess activityProcess = workActivityProcesses.get(i);
@@ -2711,10 +2713,20 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                             //正式接口
                             String url = "http://comp.jszj.com.cn:8031/api/addProject";
                             //发送请求
-                            String returnResult = HttpPostTool.doPost(url, encryptByAes);
+                            /*String returnResult = HttpPostTool.doPost(url, encryptByAes);
                             HashMap hashMap = JSON.parseObject(returnResult, HashMap.class);
                             if(!"1".equals(hashMap.get("code"))){
                                 return "上报失败：" + hashMap.get("msg").toString();
+                            }*/
+                            //修改项目上报表中状态
+                            reported.setReportStatus(String.valueOf(ProjectStatusEnum.SIGNED.getValue()));
+
+                            //修改项目表中上报状态
+                            //判断项目是否超期，如果超期则将上报标志改为超期上报（7） 否则变更为正常上报数据
+                            if(1 == record.getOverDueStatus()){
+                                records.setReportedState("7");
+                            }else{
+                                records.setReportedState(String.valueOf(ProjectStatusEnum.SIGNED.getValue()));
                             }
                         } else {
                             notifyRole = "调整上报信息";
@@ -2727,6 +2739,16 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                         if ("yes".equals(reported.getAct().getFlag())) {
                             notifyRole = "审批通过";
                             workActivityProcess.setIsApproval("1");
+                            //修改项目上报表中状态
+                            reported.setReportStatus(String.valueOf(ProjectStatusEnum.DISPENSE.getValue()));
+
+                            //修改项目表中上报状态
+                            //判断项目是否超期，如果超期则将上报标志改为超期上报（7） 否则变更为正常上报数据
+                            if(1 == record.getOverDueStatus()){
+                                records.setReportedState("11");
+                            }else{
+                                records.setReportedState(String.valueOf(ProjectStatusEnum.DISPENSE.getValue()));
+                            }
                         } else {
                             notifyRole = "调整上报信息";
                             workActivityProcess.setIsApproval("2");
@@ -2768,18 +2790,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
             if (!state) {
                 users.add(reported.getCreateBy());
                 if ("yes".equals(reported.getAct().getFlag())) {
-                    //修改项目上报表中状态
-                    reported.setReportStatus(String.valueOf(ProjectStatusEnum.SIGNED.getValue()));
-                    //获取项目信息
-                    RuralProjectRecords record = ruralProjectRecordsService.get(records);
-
-                    //修改项目表中上报状态
-                    //判断项目是否超期，如果超期则将上报标志改为超期上报（7） 否则变更为正常上报数据
-                    if(1 == record.getOverDueStatus()){
-                        records.setReportedState("7");
-                    }else{
-                        records.setReportedState(String.valueOf(ProjectStatusEnum.SIGNED.getValue()));
-                    }
+
                     String titleStr = "项目【"+projectRecords.getProjectName()+"】上报完成";
                     String content = "项目【"+projectRecords.getProjectName()+"】上报完成，项目" + (0 == projectRecords.getOverDueStatus()?"未超期":"超期");
                     WorkProjectNotify notify = new WorkProjectNotify();

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageController.java

@@ -1991,6 +1991,8 @@ public class RuralCostProjectMessageController extends BaseController {
 
         if (StringUtils.isNotBlank(reported.getHome()) && "home".equals(reported.getHome())){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
+        }else if (StringUtils.isNotBlank(reported.getHome()) && "notifyList".equals(reported.getHome())){
+            return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
         }else {
             return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
         }

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageNewController.java

@@ -1479,6 +1479,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
         RuralProjectRecords ruralProjectRecords = projectRecordsService.get(reported.getProjectId());
         if (StringUtils.isNotBlank(reported.getHome()) && "home".equals(reported.getHome())){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
+        }else if (StringUtils.isNotBlank(reported.getHome()) && "notifyList".equals(reported.getHome())){
+            return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
         }else {
             if("1".equals(ruralProjectRecords.getProjectType())){
                 return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";

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

@@ -489,6 +489,8 @@ function getReportedState(id)
         case "5":result.label = "signed";result.status="已上报";break;
         case "6":result.label = "signed";result.status="超期未上报";result.action = false;break;
         case "7":result.label = "signed";result.status="超期上报";break;
+        case "10":result.label = "signed";result.status="无需上报";break;
+        case "11":result.label = "signed";result.status="超期无需上报";break;
         default:
             result.label = "unknown";result.status="未知";break;
     }

src/main/webapp/static/oss/ossupload.js

@@ -48,18 +48,18 @@ function ftlUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,d
     file.name.replace(/—/g,"")
     var fileName = file.name;
     // 将单引号‘’都转换成'，将双引号“”都转换成"
-    fileName = fileName.replaceAll(/\’|\‘/g,"'").replaceAll(/\“|\”/g,"\"");
+    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"\"");
     // 将中括号【】转换成[]，将大括号｛｝转换成{}
-    fileName = fileName.replaceAll(/\【/g,"(").replaceAll(/\】/g,")").replaceAll(/\｛/g,"(").replaceAll(/\｝/g,")");
-    fileName = fileName.replaceAll(/\[/g,"(").replaceAll(/\]/g,")").replaceAll(/\{/g,"(").replaceAll(/\}/g,")");
+    fileName = fileName.replace(/\【/g,"(").replace(/\】/g,")").replace(/\｛/g,"(").replace(/\｝/g,")");
+    fileName = fileName.replace(/\[/g,"(").replace(/\]/g,")").replace(/\{/g,"(").replace(/\}/g,")");
     // 将逗号，转换成,，将：转换成:
-    fileName = fileName.replaceAll(/，/g,",").replaceAll(/：/g,":");
+    fileName = fileName.replace(/，/g,",").replace(/：/g,":");
     //将中文——转换为英文-
-    fileName = fileName.replaceAll(/—/g,"-")
-    fileName = fileName.replaceAll("……","")
-    fileName = fileName.replaceAll("±","")
-    fileName = fileName.replaceAll("#","")
-    fileName = fileName.replaceAll("%","")
+    fileName = fileName.replace(/—/g,"-")
+    fileName = fileName.replace(/……/g,"")
+    fileName = fileName.replace(/±/g,"")
+    fileName = fileName.replace(/#/g,"")
+    fileName = fileName.replace(/%/g,"")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
     /*console.log(file.name.indexOf("—")!=-1);
@@ -72,18 +72,18 @@ function multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,upload
     file.name.replace(/—/g,"")
     var fileName = file.name;
     // 将单引号‘’都转换成'，将双引号“”都转换成"
-    fileName = fileName.replaceAll(/\’|\‘/g,"'").replaceAll(/\“|\”/g,"\"");
+    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"\"");
     // 将中括号【】转换成[]，将大括号｛｝转换成{}
-    fileName = fileName.replaceAll(/\【/g,"(").replaceAll(/\】/g,")").replaceAll(/\｛/g,"(").replaceAll(/\｝/g,")");
-    fileName = fileName.replaceAll(/\[/g,"(").replaceAll(/\]/g,")").replaceAll(/\{/g,"(").replaceAll(/\}/g,")");
+    fileName = fileName.replace(/\【/g,"(").replace(/\】/g,")").replace(/\｛/g,"(").replace(/\｝/g,")");
+    fileName = fileName.replace(/\[/g,"(").replace(/\]/g,")").replace(/\{/g,"(").replace(/\}/g,")");
     // 将逗号，转换成,，将：转换成:
-    fileName = fileName.replaceAll(/，/g,",").replaceAll(/：/g,":");
+    fileName = fileName.replace(/，/g,",").replace(/：/g,":");
     //将中文——转换为英文-
-    fileName = fileName.replaceAll(/—/g,"-")
-    fileName = fileName.replaceAll("……","")
-    fileName = fileName.replaceAll("±","")
-    fileName = fileName.replaceAll("#","")
-    fileName = fileName.replaceAll("%","")
+    fileName = fileName.replace(/—/g,"-")
+    fileName = fileName.replace(/……/g,"")
+    fileName = fileName.replace(/±/g,"")
+    fileName = fileName.replace(/#/g,"")
+    fileName = fileName.replace(/%/g,"")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
     /*console.log(file.name.indexOf("—")!=-1);
@@ -102,18 +102,18 @@ function multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,upload
     file.name.replace(/—/g,"")
     var fileName = file.name;
     // 将单引号‘’都转换成'，将双引号“”都转换成"
-    fileName = fileName.replaceAll(/\’|\‘/g,"'").replaceAll(/\“|\”/g,"\"");
+    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"\"");
     // 将中括号【】转换成[]，将大括号｛｝转换成{}
-    fileName = fileName.replaceAll(/\【/g,"(").replaceAll(/\】/g,")").replaceAll(/\｛/g,"(").replaceAll(/\｝/g,")");
-    fileName = fileName.replaceAll(/\[/g,"(").replaceAll(/\]/g,")").replaceAll(/\{/g,"(").replaceAll(/\}/g,")");
+    fileName = fileName.replace(/\【/g,"(").replace(/\】/g,")").replace(/\｛/g,"(").replace(/\｝/g,")");
+    fileName = fileName.replace(/\[/g,"(").replace(/\]/g,")").replace(/\{/g,"(").replace(/\}/g,")");
     // 将逗号，转换成,，将：转换成:
-    fileName = fileName.replaceAll(/，/g,",").replaceAll(/：/g,":");
+    fileName = fileName.replace(/，/g,",").replace(/：/g,":");
     //将中文——转换为英文-
-    fileName = fileName.replaceAll(/—/g,"-")
-    fileName = fileName.replaceAll("……","")
-    fileName = fileName.replaceAll("±","")
-    fileName = fileName.replaceAll("#","")
-    fileName = fileName.replaceAll("%","")
+    fileName = fileName.replace(/—/g,"-")
+    fileName = fileName.replace(/……/g,"")
+    fileName = fileName.replace(/±/g,"")
+    fileName = fileName.replace(/#/g,"")
+    fileName = fileName.replace(/%/g,"")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
 
@@ -301,18 +301,18 @@ function multipartUploadWithStsCollection(storeAs, file,attachmentId,attachmentF
     file.fileName.replace(/—/g,"")
     var fileName = file.fileName;
     // 将单引号‘’都转换成'，将双引号“”都转换成"
-    fileName = fileName.replaceAll(/\’|\‘/g,"'").replaceAll(/\“|\”/g,"\"");
+    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"\"");
     // 将中括号【】转换成[]，将大括号｛｝转换成{}
-    fileName = fileName.replaceAll(/\【/g,"(").replaceAll(/\】/g,")").replaceAll(/\｛/g,"(").replaceAll(/\｝/g,")");
-    fileName = fileName.replaceAll(/\[/g,"(").replaceAll(/\]/g,")").replaceAll(/\{/g,"(").replaceAll(/\}/g,")");
+    fileName = fileName.replace(/\【/g,"(").replace(/\】/g,")").replace(/\｛/g,"(").replace(/\｝/g,")");
+    fileName = fileName.replace(/\[/g,"(").replace(/\]/g,")").replace(/\{/g,"(").replace(/\}/g,")");
     // 将逗号，转换成,，将：转换成:
-    fileName = fileName.replaceAll(/，/g,",").replaceAll(/：/g,":");
+    fileName = fileName.replace(/，/g,",").replace(/：/g,":");
     //将中文——转换为英文-
-    fileName = fileName.replaceAll(/—/g,"-")
-    fileName = fileName.replaceAll("……","")
-    fileName = fileName.replaceAll("±","")
-    fileName = fileName.replaceAll("#","")
-    fileName = fileName.replaceAll("%","")
+    fileName = fileName.replace(/—/g,"-")
+    fileName = fileName.replace(/……/g,"")
+    fileName = fileName.replace(/±/g,"")
+    fileName = fileName.replace(/#/g,"")
+    fileName = fileName.replace(/%/g,"")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
 
@@ -789,18 +789,18 @@ function multipartUploadWithStsRecordsReported(storeAs, file,attachmentId,attach
     file.name.replace(/—/g,"")
     var fileName = file.name;
     // 将单引号‘’都转换成'，将双引号“”都转换成"
-    fileName = fileName.replaceAll(/\’|\‘/g,"'").replaceAll(/\“|\”/g,"\"");
+    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"\"");
     // 将中括号【】转换成[]，将大括号｛｝转换成{}
-    fileName = fileName.replaceAll(/\【/g,"(").replaceAll(/\】/g,")").replaceAll(/\｛/g,"(").replaceAll(/\｝/g,")");
-    fileName = fileName.replaceAll(/\[/g,"(").replaceAll(/\]/g,")").replaceAll(/\{/g,"(").replaceAll(/\}/g,")");
+    fileName = fileName.replace(/\【/g,"(").replace(/\】/g,")").replace(/\｛/g,"(").replace(/\｝/g,")");
+    fileName = fileName.replace(/\[/g,"(").replace(/\]/g,")").replace(/\{/g,"(").replace(/\}/g,")");
     // 将逗号，转换成,，将：转换成:
-    fileName = fileName.replaceAll(/，/g,",").replaceAll(/：/g,":");
+    fileName = fileName.replace(/，/g,",").replace(/：/g,":");
     //将中文——转换为英文-
-    fileName = fileName.replaceAll(/—/g,"-")
-    fileName = fileName.replaceAll("……","")
-    fileName = fileName.replaceAll("±","")
-    fileName = fileName.replaceAll("#","")
-    fileName = fileName.replaceAll("%","")
+    fileName = fileName.replace(/—/g,"-")
+    fileName = fileName.replace(/……/g,"")
+    fileName = fileName.replace(/±/g,"")
+    fileName = fileName.replace(/#/g,"")
+    fileName = fileName.replace(/%/g,"")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
 
@@ -1246,18 +1246,18 @@ function fileCollectAccessory(storeAs, file,attachmentId,attachmentFlag,uploadPa
     file.name.replace(/—/g,"")
     var fileName = file.name;
     // 将单引号‘’都转换成'，将双引号“”都转换成"
-    fileName = fileName.replaceAll(/\’|\‘/g,"'").replaceAll(/\“|\”/g,"\"");
+    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"\"");
     // 将中括号【】转换成[]，将大括号｛｝转换成{}
-    fileName = fileName.replaceAll(/\【/g,"(").replaceAll(/\】/g,")").replaceAll(/\｛/g,"(").replaceAll(/\｝/g,")");
-    fileName = fileName.replaceAll(/\[/g,"(").replaceAll(/\]/g,")").replaceAll(/\{/g,"(").replaceAll(/\}/g,")");
+    fileName = fileName.replace(/\【/g,"(").replace(/\】/g,")").replace(/\｛/g,"(").replace(/\｝/g,")");
+    fileName = fileName.replace(/\[/g,"(").replace(/\]/g,")").replace(/\{/g,"(").replace(/\}/g,")");
     // 将逗号，转换成,，将：转换成:
-    fileName = fileName.replaceAll(/，/g,",").replaceAll(/：/g,":");
+    fileName = fileName.replace(/，/g,",").replace(/：/g,":");
     //将中文——转换为英文-
-    fileName = fileName.replaceAll(/—/g,"-")
-    fileName = fileName.replaceAll("……","")
-    fileName = fileName.replaceAll("±","")
-    fileName = fileName.replaceAll("#","")
-    fileName = fileName.replaceAll("%","")
+    fileName = fileName.replace(/—/g,"-")
+    fileName = fileName.replace(/……/g,"")
+    fileName = fileName.replace(/±/g,"")
+    fileName = fileName.replace(/#/g,"")
+    fileName = fileName.replace(/%/g,"")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
     requestUrl = realPath+"/previewController/getAccess";

src/main/webapp/webpage/modules/sys/gridinvoiceproject.jsp

@@ -156,7 +156,8 @@
 								<th>项目名称</th>
 								<th>项目编号</th>
 								<th>项目报告号</th>
-								<th>负责人</th>
+								<th>登记人</th>
+								<th>责任人</th>
 								<th>委托方</th>
 								<th>是否开票</th>
 							</c:forEach>
@@ -171,6 +172,7 @@
 									<td class="codelabel">${obj.projectName}</td>
 									<td class="codelabel">${obj.projectId}</td>
 									<td class="codenumber">${obj.reportData.number}</td>
+									<td class="codelabel">${obj.projectRegistrant}</td>
 									<td class="codelabel">${obj.leaderNameStr}</td>
 									<td class="codelabel">${obj.workContractInfo.client.name}</td>
 									<td class="codelabel">${obj.invoiceFlag}</td>