项目等级修改，添加是否生成报告号属性

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectRecordsController.java

@@ -717,8 +717,9 @@ public class ProjectRecordsController extends BaseController {
 	@ResponseBody
 	@RequestMapping(value = "getLinkManByClientId")
     public Map<String, Object> queryWorkClientLinkMen(String clientId){
-		WorkClientLinkman linkman = workClientInfoService.queryLinkManByClientId(clientId);
-		if (linkman != null) {
+		List<WorkClientLinkman> linkmanList = workClientInfoService.queryLinkManByClientId(clientId);
+		if (linkmanList != null && linkmanList.size()>0) {
+			WorkClientLinkman linkman = linkmanList.get(0);
 			WorkClientInfo workClientInfo = workClientInfoService.get(clientId);
 			Map<String, Object> map = new HashMap<>();
 			map.put("id", linkman.getId());

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

@@ -204,6 +204,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 
 	private Integer planCount;	//项目计划数量
 	private BigDecimal submitScale;	//送审规模
+	private Boolean createReportFlag;	//生成报告号判断条件
 
 
 	private List<String> civilProjectList = Lists.newArrayList();
@@ -1444,4 +1445,12 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setNewReportedNotifyFlag(Integer newReportedNotifyFlag) {
 		this.newReportedNotifyFlag = newReportedNotifyFlag;
 	}
+
+	public Boolean getCreateReportFlag() {
+		return createReportFlag;
+	}
+
+	public void setCreateReportFlag(Boolean createReportFlag) {
+		this.createReportFlag = createReportFlag;
+	}
 }

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

@@ -491,7 +491,10 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 				workClientAttachmentDao.insert(workattachment);
 			}
 		}
-
+		//判断是否需要生成报告号
+		if(projectRecords.getCreateReportFlag()){
+			this.createReportDataId(projectRecords);
+		}
 		/*//项目添加报告号
 		//查询该项目是否已经存在报告号，若存在则不进行添加
 		ProjectReportData reportData = projectReportDataDao.getProjectReportData(projectRecords.getId());

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

@@ -208,6 +208,7 @@ public class RuralCostProjectRecordsController extends BaseController {
 			//获取工程类型
 			ProjectEngineeringInfo engineeringInfos=engineeringService.get(projectRecords.getEngineeringType());
 			model.addAttribute("engineeringInfo", engineeringInfos);
+			projectRecords.setCreateReportFlag(false);
             /*//处理所在地信息
             StringBuffer areaName = new StringBuffer();
 			if(StringUtils.isNotBlank(projectRecords.getProvince())){
@@ -225,6 +226,7 @@ public class RuralCostProjectRecordsController extends BaseController {
 		    projectRecords.setCreateDate(new Date());
 			projectRecords.setLeaderIds(UserUtils.getUser().getId());
 			projectRecords.setLeaderNameStr(UserUtils.getUser().getName());
+			projectRecords.setCreateReportFlag(true);
         }
 
 		model.addAttribute("ruralProjectRecords", projectRecords);
@@ -876,8 +878,9 @@ public class RuralCostProjectRecordsController extends BaseController {
 	@ResponseBody
 	@RequestMapping(value = "getLinkManByClientId")
     public Map<String, Object> queryWorkClientLinkMen(String clientId){
-		WorkClientLinkman linkman = workClientInfoService.queryLinkManByClientId(clientId);
-		if (linkman != null) {
+		List<WorkClientLinkman> linkmanList = workClientInfoService.queryLinkManByClientId(clientId);
+		if (linkmanList != null && linkmanList.size()>0) {
+			WorkClientLinkman linkman = linkmanList.get(0);
 			WorkClientInfo workClientInfo = workClientInfoService.get(clientId);
 			Map<String, Object> map = new HashMap<>();
 			map.put("id", linkman.getId());

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

@@ -207,6 +207,7 @@ public class RuralProjectRecordsController extends BaseController {
 		if (projectRecords!=null&&StringUtils.isNotBlank(projectRecords.getId())) {
 			projectRecords = projectRecordsService.get(projectRecords.getId());
             projectRecordsService.queryProjectDetail(projectRecords);
+			projectRecords.setCreateReportFlag(false);
 			//查询工程分类
 			ProjectEngineeringInfo engineeringInfo=engineeringService.get(projectRecords.getEngineeringType());
 			model.addAttribute("engineeringInfo", engineeringInfo);
@@ -215,6 +216,7 @@ public class RuralProjectRecordsController extends BaseController {
 		    projectRecords.setCreateDate(new Date());
 			projectRecords.setLeaderIds(UserUtils.getUser().getId());
 			projectRecords.setLeaderNameStr(UserUtils.getUser().getName());
+			projectRecords.setCreateReportFlag(true);
         }
 
 		model.addAttribute("ruralProjectRecords", projectRecords);
@@ -880,8 +882,9 @@ public class RuralProjectRecordsController extends BaseController {
 	@ResponseBody
 	@RequestMapping(value = "getLinkManByClientId")
     public Map<String, Object> queryWorkClientLinkMen(String clientId){
-		WorkClientLinkman linkman = workClientInfoService.queryLinkManByClientId(clientId);
-		if (linkman != null) {
+		List<WorkClientLinkman> linkmanList = workClientInfoService.queryLinkManByClientId(clientId);
+		if (linkmanList != null && linkmanList.size()>0) {
+			WorkClientLinkman linkman = linkmanList.get(0);
 			WorkClientInfo workClientInfo = workClientInfoService.get(clientId);
 			Map<String, Object> map = new HashMap<>();
 			map.put("id", linkman.getId());

src/main/java/com/jeeplus/modules/workclientinfo/dao/WorkClientLinkmanDao.java

@@ -36,7 +36,7 @@ public interface WorkClientLinkmanDao extends CrudDao<WorkClientLinkman> {
 
     List<WorkClientLinkman> queryProjectLinkmans(@Param("projectId") String projectId, @Param("isEntrust") int i);
 
-    WorkClientLinkman queryLinkManByClientId(String id);
+    List<WorkClientLinkman> queryLinkManByClientId(String id);
 
     /**
      * 无合同状态下，添加委托方联系人，查询该公司下所有客户
@@ -54,4 +54,4 @@ public interface WorkClientLinkmanDao extends CrudDao<WorkClientLinkman> {
     void jobTypeDelete(String workClientId);
     //根据客户信息表id查出来对应的联系人信息
     List<WorkClientLinkman> getLinkMan(WorkClientLinkman workClientLinkman);
-}
+}

src/main/java/com/jeeplus/modules/workclientinfo/service/WorkClientInfoAllService.java

@@ -711,7 +711,7 @@ public class WorkClientInfoAllService extends CrudService<WorkClientInfoDao, Wor
         return page;
     }
 
-    public WorkClientLinkman queryLinkManByClientId(String clientId){
+    public List<WorkClientLinkman> queryLinkManByClientId(String clientId){
         return workClientLinkmanDao.queryLinkManByClientId(clientId);
     }
 

src/main/java/com/jeeplus/modules/workclientinfo/service/WorkClientInfoService.java

@@ -713,7 +713,7 @@ public class WorkClientInfoService extends CrudService<WorkClientInfoDao, WorkCl
         return page;
     }
 
-    public WorkClientLinkman queryLinkManByClientId(String clientId){
+    public List<WorkClientLinkman> queryLinkManByClientId(String clientId){
         return workClientLinkmanDao.queryLinkManByClientId(clientId);
     }
 

src/main/resources/mappings/modules/workclientinfo/WorkClientLinkmanDao.xml

@@ -292,6 +292,7 @@
 		select <include refid="linkManColumn"/>
 		from work_client_linkman a
 		where a.client_id = #{id}
+		order by a.name
 	</select>
 
 	<!--<select id="queryLinkManByCompany" parameterType="WorkClientLinkman" resultType="WorkClientLinkman">
@@ -369,4 +370,4 @@
 
 
 	</select>
-</mapper>
+</mapper>

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

@@ -180,6 +180,10 @@
                         });
                     }
                 });
+                form.on('switch(reportSwitch)',function(data){
+                    var flag=$(this).prop("checked")
+                    $("#createReportFlag").val(flag);
+                })
             });
             var radioVal ;
             validateForm = $("#inputForm").validate({
@@ -767,6 +771,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="createReportFlag" name="createReportFlag" value="${ruralProjectRecords.createReportFlag}">
 
             <input type="hidden" id="workClientLinkmanInfo" value="${ruralProjectRecords.workClientLinkmanList}">
             <div class="form-group layui-row first">
@@ -984,6 +989,18 @@
 <%--                        </form:select>--%>
                     </div>
                 </div>
+
+                <c:if test="${ruralProjectRecords.createReportFlag}">
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label double-line"><span class="require-item">*</span>是否生成报告号：</label>
+                        <div class="layui-input-block">
+                            <div style="margin-right: 30px;">
+                                <input type="checkbox" id="reportSwitch" <c:if test="${ruralProjectRecords.createReportFlag}">checked</c:if> lay-filter="reportSwitch" lay-skin="switch" lay-text="是|否">
+                            </div>
+                        </div>
+                    </div>
+                </c:if>
+
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>送审规模（万元）：</label>
                     <div class="layui-input-block">

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

@@ -562,7 +562,7 @@
 						}
 						if(d.reportDataFlag != undefined && d.reportDataFlag =="1")
 						{
-							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/createReportDataId?id=" + d.id + "&projectType=2"+"\" onclick=\"return confirmx('确认要生成报告号吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-orange\"> 生成报告号</a>";
+							//xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/createReportDataId?id=" + d.id + "&projectType=2"+"\" onclick=\"return confirmx('确认要生成报告号吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-orange\"> 生成报告号</a>";
 						}
                         if(d.canedit3 != undefined && d.canedit3 =="1")
                         {

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

@@ -194,6 +194,10 @@
                         });
                     }
                 });
+                form.on('switch(reportSwitch)',function(data){
+                    var flag=$(this).prop("checked")
+                    $("#createReportFlag").val(flag);
+                })
             });
             var radioVal ;
             validateForm = $("#inputForm").validate({
@@ -793,6 +797,7 @@
             <form:hidden path="workContractInfo.client.id" id="contractClientId" value="${workContractInfo.client.id}"/>
             <input type="hidden" id="workClientLinkmanInfo" value="${ruralProjectRecords.workClientLinkmanList}">
             <input type="hidden" id="flagFile" value="">
+            <input type="hidden" id="createReportFlag" name="createReportFlag" value="${ruralProjectRecords.createReportFlag}">
 
             <div class="form-group layui-row first">
                 <div class="form-group layui-row">
@@ -1002,6 +1007,16 @@
 <%--                        </form:select>--%>
                     </div>
                 </div>
+                <c:if test="${ruralProjectRecords.createReportFlag}">
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label double-line"><span class="require-item">*</span>是否生成报告号：</label>
+                        <div class="layui-input-block">
+                            <div style="margin-right: 30px;">
+                                <input type="checkbox" id="reportSwitch" <c:if test="${ruralProjectRecords.createReportFlag}">checked</c:if> lay-filter="reportSwitch" lay-skin="switch" lay-text="是|否">
+                            </div>
+                        </div>
+                    </div>
+                </c:if>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>送审规模（万元）：</label>
                     <div class="layui-input-block">

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

@@ -531,7 +531,7 @@
                         }
 						if(d.reportDataFlag != undefined && d.reportDataFlag =="1")
 						{
-							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/createReportDataId?id=" + d.id + "&projectType=1"+"\" onclick=\"return confirmx('确认要生成报告号吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-orange\"> 生成报告号</a>";
+							//xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/createReportDataId?id=" + d.id + "&projectType=1"+"\" onclick=\"return confirmx('确认要生成报告号吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-orange\"> 生成报告号</a>";
 						}
                         if(d.canedit3 != undefined && d.canedit3 =="1")
                         {