Merge branch 'master' of http://192.168.2.4:3000/user5/simple_xg_total_process_master

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

@@ -1093,28 +1093,36 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             //保存工作报告相关数据
             ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
             if(StringUtils.isNotBlank(projectReportData.getId())){
-                projectReportData = projectReportDataDao.get(projectReportData.getId());
-            }
-            projectReportData.setName(projectcontentinfo.getProjectOnRural().getProjectName());
-            projectReportData.setCompanyId(contentinfo.getCompanyId());
-            projectReportData.setOfficeId(contentinfo.getOfficeId());
-            projectReportData.setProject(contentinfo.getProject());
-            if(null == projectReportData.getAuditPassDate()){
-                projectReportData.setAuditPassDate(new Date());
-            }
-            projectReportData.setReportDate(new Date());
-            if (com.jeeplus.common.utils.StringUtils.isBlank(projectReportData.getId())){
-                projectReportData.setFileStatus("1");
-            }
-            //修改保存
-//            String num = projectReportData.getNumber();
+                ProjectReportData oldProjectReportData = projectReportDataDao.get(projectReportData.getId());
+                try {
+                    MyBeanUtils.copyBeanNotNull2Bean(projectReportData,oldProjectReportData);//将编辑表单中的非NULL值覆盖数据库记录中的值
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    logger.error("Exception e:"+e);
+                }
+
+                oldProjectReportData.setName(projectcontentinfo.getProjectOnRural().getProjectName());
+                oldProjectReportData.setCompanyId(contentinfo.getCompanyId());
+                oldProjectReportData.setOfficeId(contentinfo.getOfficeId());
+                oldProjectReportData.setProject(contentinfo.getProject());
+                if(null == oldProjectReportData.getAuditPassDate()){
+                    oldProjectReportData.setAuditPassDate(new Date());
+                }
+                oldProjectReportData.setReportDate(new Date());
+                if (com.jeeplus.common.utils.StringUtils.isBlank(oldProjectReportData.getId())){
+                    oldProjectReportData.setFileStatus("1");
+                }
+                //修改保存
+//            String num = oldProjectReportData.getNumber();
 //            if(com.jeeplus.common.utils.StringUtils.isNotBlank(num)){
 //                projectReportNumService.updateNum(num);
 //            }
-            projectReportDataService.save(projectReportData);
-//            contentinfo.setDictType(projectReportData.getType());
-//            contentinfo.setInfoId(projectReportData.getId());
+                projectReportDataService.save(oldProjectReportData);
+//            contentinfo.setDictType(oldProjectReportData.getType());
+//            contentinfo.setInfoId(oldProjectReportData.getId());
 //            projectcontentinfoDao.updateInfoId(contentinfo);
+            }
+
         }
         historicalService.save(historicalData);
         //上报修改

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

@@ -50,7 +50,6 @@ import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import com.jeeplus.modules.workreimbursement.service.WorkReimbursementService;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
-import org.apache.regexp.RE;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.json.JSONArray;
@@ -449,6 +448,11 @@ public class RuralProjectRecordsController extends BaseController {
 	public String adminModify(RuralProjectRecords projectRecords, Model model) {
 		projectRecords=projectRecordsService.get(projectRecords.getId());
 		projectRecordsService.queryProjectDetail(projectRecords);
+
+		//根据归属部门Id查询归属部门名称显示
+		String belongingDepartmentName = projectRecordsService.getBelongingDepartmentNameByBelongingDepartment(projectRecords.getBelongingDepartment());
+		model.addAttribute("belongingDepartmentName",belongingDepartmentName);
+
 		ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
 		projectPlanInfo.setProjectId(projectRecords.getId());
 		if(null != projectRecords.getWorkContractInfo()){

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

@@ -140,10 +140,10 @@
                 // })
             });
             //默认打开判断是否时紧急项目
-            var submitMoney="${ruralProjectRecords.submitMoney}"
+            var submitMoney="${projectRecords.submitMoney}"
             if(submitMoney==1){
                 // $("#emergencyProject").parent().parent().parent().show();
-                var emergencyProject="${ruralProjectRecords.emergencyProject}"
+                var emergencyProject="${projectRecords.emergencyProject}"
                 if (emergencyProject=="1"){
                     $("#emergencyProjectFlag").val("1");
                     // $("#emergencyProject").prop("checked",true);
@@ -678,7 +678,7 @@
 		    <form:hidden path="id"/>
             <form:hidden path="workContractInfo.client.id" id="contractClientId" value="${workContractInfo.client.id}"/>
             <input type="hidden" id="flagFile" value="">
-            <input type="hidden" id="emergencyProjectFlag" name="emergencyProject" value="${ruralProjectRecords.emergencyProject}">
+            <input type="hidden" id="emergencyProjectFlag" name="emergencyProject" value="${projectRecords.emergencyProject}">
 
             <input type="hidden" id="workClientLinkmanInfo" value="${projectRecords.workClientLinkmanList}">
             <div class="form-group layui-row first">
@@ -831,7 +831,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>投资性质：</label>
                     <div class="layui-input-block readOnlyFFF">
-                        <form:select placeholder="请选择" path="projectProperties" class="form-control required editable-select layui-input" id="projectProperties" value="${ruralProjectRecords.projectProperties}">
+                        <form:select placeholder="请选择" path="projectProperties" class="form-control required editable-select layui-input" id="projectProperties" value="${projectRecords.projectProperties}">
                             <form:option value=""/>
                             <form:options items="${fns:getMainDictList('project_properties')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -889,7 +889,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">项目归属部门：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselectbelongingDepartment id="belongingDepartment" name="belongingDepartment" value="${ruralProjectRecords.belongingDepartment}" labelName="belongingDepartmentName" labelValue="${belongingDepartmentName}"
+                        <sys:treeselectbelongingDepartment id="belongingDepartment" name="belongingDepartment" value="${projectRecords.belongingDepartment}" labelName="belongingDepartmentName" labelValue="${belongingDepartmentName}"
                                                            cssStyle="background-color:#fff" title="项目归属部门" url="/sys/office/treeDataAllByBelongingDepartment?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
@@ -907,7 +907,7 @@
                     <label class="layui-form-label"><span class="require-item">*</span>项目等级：</label>
                     <div class="layui-input-block">
                         <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
-                            <input type="radio" name="submitMoney" id="submitMoney" value="${v.value}" lay-filter="submitMoney"  title="${v.label}" <c:if test="${ruralProjectRecords.submitMoney==v.value}">checked</c:if>>
+                            <input type="radio" name="submitMoney" id="submitMoney" value="${v.value}" lay-filter="submitMoney"  title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
                         </c:forEach>
                         <p style="color: red;font-size: 12px;">500万及500万以上为A级，500万以下为B级</p>
                     </div>
@@ -929,13 +929,13 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作开始日期：</label>
                     <div class="layui-input-block">
-                        <input placeholder="请选择工作开始日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+                        <input placeholder="请选择工作开始日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作结束日期：</label>
                     <div class="layui-input-block">
-                        <input placeholder="请输入工作结束日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+                        <input placeholder="请输入工作结束日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

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

@@ -606,7 +606,7 @@
         }
         function reProjectName(obj) {
             var name=$(obj).val()
-            var proName='${ruralProjectRecords.projectName}'
+            var proName='${projectRecords.projectName}'
             $.ajax({
                 type : "POST",
                 url : "${ctx}/ruralProject/ruralProjectRecords/reProjectName",
@@ -774,7 +774,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>投资性质：</label>
                     <div class="layui-input-block readOnlyFFF">
-                        <form:select placeholder="请选择" path="projectProperties" class="form-control required editable-select layui-input" id="projectProperties" value="${ruralProjectRecords.projectProperties}">
+                        <form:select placeholder="请选择" path="projectProperties" class="form-control required editable-select layui-input" id="projectProperties" value="${projectRecords.projectProperties}">
                             <form:option value=""/>
                             <form:options items="${fns:getMainDictList('project_properties')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -830,6 +830,13 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">项目归属部门：</label>
+                    <div class="layui-input-block  with-icon">
+                        <sys:treeselectbelongingDepartment id="belongingDepartment" name="belongingDepartment" value="${projectRecords.belongingDepartment}" labelName="belongingDepartmentName" labelValue="${belongingDepartmentName}"
+                                                           cssStyle="background-color:#fff" title="项目归属部门" url="/sys/office/treeDataAllByBelongingDepartment?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>工程类型：</label>
                     <div class="layui-input-block">
                         <button type="button" class="layui-btn layui-btn-primary" style="width: 100%;text-align: left" id="demo100">
@@ -840,23 +847,30 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>送审规模：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>项目等级：</label>
                     <div class="layui-input-block">
-                        <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" var="v">
-                            <input type="radio" name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${ruralProjectRecords.submitMoney==v.value}">checked</c:if>>
+                        <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
+                            <input type="radio" name="submitMoney" id="submitMoney" value="${v.value}" lay-filter="submitMoney"  title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
                         </c:forEach>
+                        <p style="color: red;font-size: 12px;">500万及500万以上为A级，500万以下为B级</p>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>送审规模（万元）：</label>
+                    <div class="layui-input-block">
+                        <form:input path="submitScale" id="submitScale" maxlength="12" htmlEscape="false" onkeyup="wirteNum(this)" placeholder="请输入送审规模" class="form-control required layui-input number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作开始日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+                        <input placeholder="请选择工作开始日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作结束日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+                        <input placeholder="请输入工作结束日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">