工程类别调整以及指定工程类别生成指定的报告号文件

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

@@ -433,6 +433,23 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 				}
 			}
 		}
+		//判断项目类型并判断项目类别
+		switch (projectRecords.getProjectType()){
+			case "1":
+				if("8".equals(projectRecords.getAttachmentProjectSort())){
+					projectRecords.setReportedState("10");
+				}else{
+					projectRecords.setReportedState("");
+				}
+				break;
+			case "2":
+				if("5".equals(projectRecords.getAttachmentProjectSort()) || "6".equals(projectRecords.getAttachmentProjectSort())){
+					projectRecords.setReportedState("10");
+				}else{
+					projectRecords.setReportedState("");
+				}
+				break;
+		}
         if(projectRecords.getProjectStatus()== ProjectStatusEnum.INVALID.getValue()){
             projectRecords.setId(IdGen.uuid());
             dao.insert(projectRecords);
@@ -2188,11 +2205,29 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		if(null == reportData){
 			//添加查询报告号模板的bizCode参数
 			ProjectReportData projectReportData = new ProjectReportData();
-			if("1".equals(projectRecords.getProjectType())){
+			/*if("1".equals(projectRecords.getProjectType())){
 				projectReportData.setConditionType("10");
 			}else if("2".equals(projectRecords.getProjectType())){
 				projectReportData.setConditionType("1003");
+			}*/
+
+			switch (projectRecords.getProjectType()){
+				case "1":
+					if("8".equals(projectRecords.getAttachmentProjectSort())){
+						projectReportData.setConditionType("1006");
+					}else{
+						projectReportData.setConditionType("10");
+					}
+					break;
+				case "2":
+					if("5".equals(projectRecords.getAttachmentProjectSort()) || "6".equals(projectRecords.getAttachmentProjectSort())){
+						projectReportData.setConditionType("1005");
+					}else{
+						projectReportData.setConditionType("1003");
+					}
+					break;
 			}
+
 			synchronized (SYN_BYTE) {
 				String reportNo = createReportNo(projectReportData.getConditionType());
 				projectReportData.setNumber(reportNo);

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -541,7 +541,8 @@
 			engineering_type,
 			project_properties,
 			submit_scale,
-			emergency_project
+			emergency_project,
+			reported_state
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -592,7 +593,8 @@
 		    #{engineeringType},
 		    #{projectProperties},
 		    #{submitScale},
-		    #{emergencyProject}
+		    #{emergencyProject},
+		    #{reportedState}
 		)
 	</insert>
 
@@ -645,6 +647,15 @@
 			project_properties =#{projectProperties},
 			submit_scale =#{submitScale},
 			emergency_project=#{emergencyProject}
+
+			<choose>
+				<when test="reportedState ==null or reportedState == ''">
+					,reported_state = null
+				</when>
+				<otherwise>
+					,reported_state = #{reportedState}
+				</otherwise>
+			</choose>
 		WHERE id = #{id}
 	</update>
 	<update id="updateDate">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/adminReportEditForm.jsp

@@ -1673,9 +1673,9 @@
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6 lw7">
-						<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+						<label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
 						<div class="layui-input-block">
-							<form:input path="projectReportData.ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onkeyup="num(this)" class="form-control layui-input"/>
+							<form:input path="projectReportData.ZiXunShouRu" id="ziXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onkeyup="num(this)" class="form-control layui-input required"/>
 						</div>
 					</div>
 				</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportForm.jsp

@@ -34,6 +34,11 @@
 							parent.layer.msg("请选择审核人员!", {icon: 5});
 							return false;
 						}
+						var ziXunShouRu = $("#ziXunShouRu").val();
+						if(null == ziXunShouRu || undefined == ziXunShouRu || '' == ziXunShouRu || parseFloat(ziXunShouRu)<=0){
+							top.layer.msg("造价咨询营业收入必须大于0！", {icon: 0});
+							return false;
+						}
 						if(startDate.getTime() > endingDate.getTime()){
 							parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
 							return false;
@@ -1007,9 +1012,9 @@
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6 lw7">
-						<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+						<label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
 						<div class="layui-input-block">
-							<form:input path="projectReportData.ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onkeyup="num(this)" class="form-control layui-input"/>
+							<form:input path="projectReportData.ZiXunShouRu" id="ziXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onkeyup="num(this)" class="form-control layui-input judgment"/>
 						</div>
 					</div>
 				</div>