报告签章流程修改，添加苏州质控角色和人员以及苏州套打角色和人员等功能

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

@@ -1667,10 +1667,11 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                         synchronized (SYN_BYTE) {
                             /*String reportNo = createReportNo(reportData.getConditionType());
                             projectReportData.setNumber(reportNo);*/
+                            projectReportData.setAct(reportData.getAct());
                             new JudgementThread(ruralProjectRecords,projectReportData).start();
                             //下载审定单文件
-                            String deleteFile = null;
-                            /*try {
+                            /*String deleteFile = null;
+                            try {
                                 //进行签章处理
                                 //根据项目id查询是否已经提交过了审定单签章
                                 if(null == ruralProjectRecords){
@@ -1843,6 +1844,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
             WorkProjectNotify notify = new WorkProjectNotify();
             notify.setNotifyId(projectReportData.getId());
             userList = workProjectNotifyService.readByNotifyId(notify);
+            projectReportData.setStatus("5");
             /*if ("yes".equals(flag)) {
                 String titleStr = "项目【"+projectRecords.getProjectName()+"】报告质量复核审批通过";
                 String content = "项目【"+projectRecords.getProjectName()+"】报告质量复核审批通过";

src/main/java/com/jeeplus/modules/ruralprojectrecords/thread/JudgementThread.java

@@ -249,7 +249,7 @@ public class JudgementThread extends Thread {
             ruralProjectRecords.setQualitySignatureUploadDate(new Date());
             //修改签章对应信息文件
             projectReportDataService.updateJudgementSignatureInfo(ruralProjectRecords);
-
+            dao.update(projectReportData);
         }else{
             //users.add(projectReportSignature.getCreateBy());
             //审核完成提示框

src/main/java/com/jeeplus/modules/workclientinfo/web/WorkClientInfoController.java

@@ -229,7 +229,11 @@ public class WorkClientInfoController extends BaseController {
 		}
         if(!workClientInfo.getIsNewRecord()){//编辑表单保存
 			WorkClientInfo t = workClientInfoService.get(workClientInfo.getId());//从数据库取出记录的值
+			String officeId = t.getOfficeId();
 			MyBeanUtils.copyBeanNotNull2Bean(workClientInfo, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
+			if(StringUtils.isNotBlank(officeId)){
+				t.setOfficeId(officeId);
+			}
 			workClientInfoService.save(t);//保存
 		}else{//新增表单保存
 			workClientInfoService.save(workClientInfo);//保存

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp

@@ -1065,10 +1065,10 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">项目负责人：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:reportedtreeselectUser id="projectMaster" name="projectMasterId" value="${ruralProjectRecords.projectMasterId}" labelName="projectMasterName" labelValue="${ruralProjectRecords.projectMasterName}"
-                                                    cssStyle="background-color:#fff" title="项目负责人" url="/sys/office/treeDataAll?type=4" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                                    cssStyle="background-color:#fff" title="项目负责人" url="/sys/office/treeDataAll?type=4" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                     <span class="spanzj">必须拥有一级造价师证书</span>
                     </div>
                 </div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp

@@ -1064,10 +1064,10 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">项目负责人：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:reportedtreeselectUser id="projectMaster" name="projectMasterId" value="${ruralProjectRecords.projectMasterId}" labelName="projectMasterName" labelValue="${ruralProjectRecords.projectMasterName}"
-                                                    cssStyle="background-color:#fff" title="项目负责人" url="/sys/office/treeDataAll?type=4" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                                    cssStyle="background-color:#fff" title="项目负责人" url="/sys/office/treeDataAll?type=4" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                         <span class="spanzj">必须拥有一级造价师证书</span>
                     </div>
                 </div>