归档批次0.2.4

src/main/java/com/jeeplus/modules/projectFilingBatch/service/ProjectFilingBatchService.java

@@ -223,7 +223,7 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
                 workProjectNotify.setId("");
             }else{
                 if (xxxmgdys==null||xxxmgdys.size()==0){
-                    throw new Exception("流程审批人不能为空,角色部门负责人下无用户,请联系管理员！");
+                    throw new Exception("流程审批人不能为空,请联系管理员！");
                 }
                 processType = "projectFilingBatch";
                 variables.put("applyUserId", projectFilingBatch.getCreateBy().getId());

src/main/java/com/jeeplus/modules/projectFilingBatch/web/ProjectFilingBatchController.java

@@ -106,8 +106,8 @@ public class ProjectFilingBatchController extends BaseController {
             //项目信息
             projectFilingBatch.setProject(ruralProjectRecordsList);
         }
-        List<User> auditUserList = userService.getFilingUserList();
-        projectFilingBatch.setBzshbUserList(auditUserList);
+//        List<User> auditUserList = userService.getFilingUserList();
+//        projectFilingBatch.setBzshbUserList(auditUserList);
         model.addAttribute("projectFilingBatch", projectFilingBatch);
         return "modules/projectFilingBatch/projectFilingBatchView";
     }
@@ -146,8 +146,8 @@ public class ProjectFilingBatchController extends BaseController {
             projectFilingBatch.setCreateDate(new Date());
         }
         //查询总审人员信息
-        List<User> auditUserList = userService.getFilingUserList();
-        projectFilingBatch.setBzshbUserList(auditUserList);
+//        List<User> auditUserList = userService.getFilingUserList();
+//        projectFilingBatch.setBzshbUserList(auditUserList);
         model.addAttribute("projectFilingBatch", projectFilingBatch);
         return "modules/projectFilingBatch/projectFilingBatchForm";
     }
@@ -168,8 +168,8 @@ public class ProjectFilingBatchController extends BaseController {
             act.setTask(taskInfok);
             projectFilingBatch.setAct(act);
         }
-        List<User> auditUserList = userService.getFilingUserList();
-        projectFilingBatch.setBzshbUserList(auditUserList);
+//        List<User> auditUserList = userService.getFilingUserList();
+//        projectFilingBatch.setBzshbUserList(auditUserList);
         projectFilingBatchService.queryInfo(projectFilingBatch);
         model.addAttribute("projectFilingBatch", projectFilingBatch);
         return "modules/projectFilingBatch/projectFilingBatchApply";

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -28,6 +28,8 @@ import java.util.List;
 public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 
 	public static final String SERIAL_BIZCODE ="1";
+	public static final String PROJECT_COST_APPRAISAL ="100";//工程造价鉴定模板key
+	public static final String ECONOMIC_EVALUATION="101";//经济评价模板key
 	public static final String SERIAL_COST_BIZCODE ="1004";
 	private static final long serialVersionUID = 1L;
 	@NotNull(message = "合同信息不能为空")

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

@@ -350,6 +350,11 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		synchronized (SYN_BYTE) {
 			if (StringUtils.isBlank(projectRecords.getProjectId())) {
 				if ("1".equals(projectRecords.getProjectType())) {
+					if(projectRecords.getAttachmentProjectSort().equals("6")){
+						projectRecords.setProjectId(serialNumTplService.genSerialNum(createBy.getCompany(), RuralProjectRecords.PROJECT_COST_APPRAISAL));
+					}else if(projectRecords.getAttachmentProjectSort().equals("7")){
+						projectRecords.setProjectId(serialNumTplService.genSerialNum(createBy.getCompany(), RuralProjectRecords.ECONOMIC_EVALUATION));
+					}
 					projectRecords.setProjectId(serialNumTplService.genSerialNum(createBy.getCompany(), RuralProjectRecords.SERIAL_BIZCODE));
 				} else if ("2".equals(projectRecords.getProjectType())) {
 					projectRecords.setProjectId(serialNumTplService.genSerialNum(createBy.getCompany(), RuralProjectRecords.SERIAL_COST_BIZCODE));
@@ -1792,11 +1797,11 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		return page;
 	}
 
-	/**
-	 * 修改项目开始时间和结束时间
-	 * @param projectRecords
-	 */
-	public void updateDate(RuralProjectRecords projectRecords){
-		dao.updateDate(projectRecords);
-	}
+//	/**
+//	 * 修改项目开始时间和结束时间
+//	 * @param projectRecords
+//	 */
+//	public void updateDate(RuralProjectRecords projectRecords){
+//		dao.updateDate(projectRecords);
+//	}
 }

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -2701,8 +2701,8 @@ public class WorkProjectNotifyController extends BaseController {
 						ruralProjectRecords.setProjectReportNumber(filingBatch.getNumber());
 						ruralProjectRecordsList.add(ruralProjectRecords);
 					}
-					List<ProjectFilingbatchRelation> projectFilingbatchRelations=projectFilingbatchRelationDao.getProjectRelation(projectFilingBatch.getFilingBatch());
-					projectFilingBatch.setProjectFilingbatchRelations(projectFilingbatchRelations);
+//					List<ProjectFilingbatchRelation> projectFilingbatchRelations=projectFilingbatchRelationDao.getProjectRelation(projectFilingBatch.getFilingBatch());
+//					projectFilingBatch.setProjectFilingbatchRelations(projectFilingbatchRelations);
 					//获取归档人
 					projectFilingBatch.setCreateBy(UserUtils.get(projectFilingBatch.getCreateBy().getId()));
 					//项目信息

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchAudit.jsp

@@ -18,7 +18,12 @@
                         $("#flag").val("no2");
 					}
                 }
-                $("#inputForm").submit();
+                if ($("#clientType").val()!=null){
+					$("#inputForm").submit();
+				}else{
+					layer.msg("请输入项目信息", { icon: 2, offset: "error", time:2000 });
+				}
+
                 return true;
             }
 	
@@ -53,7 +58,8 @@
 		});
 
         function insertTitle(tValue){
-            var files = $("#attachment_file")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
+            var files = $("#attachment_file")[0].files;
+            for(var i = 0;i<files.length;i++) {                var file = files[i];
             var attachmentId = $("#id").val();
             var attachmentFlag = "82";
             console.log(file);

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchForm.jsp

@@ -669,34 +669,6 @@
                         <form:hidden path="createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
                     </div>
                 </div>
-                <c:choose>
-                    <c:when test="${not empty projectFilingBatch.bzshbUserId}">
-                        <div class="layui-item layui-col-sm6 lw7">
-                            <label class="layui-form-label"><span class="require-item">*</span>审核人员：</label>
-                            <div class="layui-input-block">
-                                <select class="form-control required editable-select layui-input" id="bzshbUserId" disabled="disabled" name="bzshbUserId">
-                                    <option value=""/>
-                                    <c:forEach items="${projectFilingBatch.bzshbUserList}" var="user" varStatus="status">
-                                        <option value="${user.id}" <c:if test="${projectFilingBatch.bzshbUserId eq user.id }">selected</c:if>>${user.name}</option>
-                                    </c:forEach>
-                                </select>
-                            </div>
-                        </div>
-                    </c:when>
-                    <c:otherwise>
-                        <div class="layui-item layui-col-sm6 lw7">
-                            <label class="layui-form-label"><span class="require-item">*</span>审核人员：</label>
-                            <div class="layui-input-block">
-                                <select class="form-control required editable-select layui-input" id="bzshbUserId"  name="bzshbUserId">
-                                    <option value=""/>
-                                    <c:forEach items="${projectFilingBatch.bzshbUserList}" var="user" varStatus="status">
-                                        <option value="${user.id}">${user.name}</option>
-                                    </c:forEach>
-                                </select>
-                            </div>
-                        </div>
-                    </c:otherwise>
-                </c:choose>
             </div>
 
             <div class="form-group layui-row">

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchView.jsp

@@ -229,34 +229,6 @@
                         <form:hidden path="createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
                     </div>
                 </div>
-                <c:choose>
-                    <c:when test="${not empty projectFilingBatch.bzshbUserId}">
-                        <div class="layui-item layui-col-sm6 lw7">
-                            <label class="layui-form-label"><span class="require-item">*</span>审核人员：</label>
-                            <div class="layui-input-block">
-                                <select class="form-control required editable-select layui-input" id="bzshbUserId" disabled="disabled" name="bzshbUserId">
-                                    <option value=""/>
-                                    <c:forEach items="${projectFilingBatch.bzshbUserList}" var="user" varStatus="status">
-                                        <option value="${user.id}" <c:if test="${projectFilingBatch.bzshbUserId eq user.id }">selected</c:if>>${user.name}</option>
-                                    </c:forEach>
-                                </select>
-                            </div>
-                        </div>
-                    </c:when>
-                    <c:otherwise>
-                        <div class="layui-item layui-col-sm6 lw7">
-                            <label class="layui-form-label"><span class="require-item">*</span>审核人员：</label>
-                            <div class="layui-input-block">
-                                <select class="form-control required editable-select layui-input" id="bzshbUserId"  name="bzshbUserId">
-                                    <option value=""/>
-                                    <c:forEach items="${projectFilingBatch.bzshbUserList}" var="user" varStatus="status">
-                                        <option value="${user.id}">${user.name}</option>
-                                    </c:forEach>
-                                </select>
-                            </div>
-                        </div>
-                    </c:otherwise>
-                </c:choose>
             </div>
 
             <div class="form-group layui-row">