添加统一社会信用代码

out/artifacts/total_process_wx_war_exploded/webpage/modules/workcontent/workContentCompleteAccountList.jsp

@@ -11,7 +11,6 @@
 
             <table id="contentTable" class="table table-bordered table-condensed can-edit">
                 <thead>
-
                     <tr>
                         <th colspan="9" style="font-size: 20px">输变电工程竣工结算审核单</th>
                     </tr>
@@ -67,7 +66,7 @@
             </td>
 
             <td class="text-center op-td">
-                        <a href="#" onclick="delRow(this, '#investmentCostList{{idx}}')"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 取消</a>
+                        <a href="#" onclick="delRow(this, '#investmentCostList{{idx}}')"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i>取消</a>
             </td>
         </tr>//-->
     </script>

src/main/java/com/jeeplus/modules/workclientinfo/entity/WorkClientLinkman.java

@@ -28,6 +28,7 @@ public class WorkClientLinkman extends DataEntity<WorkClientLinkman> {
 	private WorkClientInfo clientId;		// 外键关联客户表 父类
 	private String projectId;		// 外键关联工程表（资格预审）
 	private List<String> clientIds;
+	private String uscCode;
 	public WorkClientLinkman() {
 		super();
 	}
@@ -136,4 +137,12 @@ public class WorkClientLinkman extends DataEntity<WorkClientLinkman> {
     public void setClientIds(List<String> clientIds) {
         this.clientIds = clientIds;
     }
+
+	public String getUscCode() {
+		return uscCode;
+	}
+
+	public void setUscCode(String uscCode) {
+		this.uscCode = uscCode;
+	}
 }

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

@@ -175,6 +175,43 @@ public class WorkClientInfoController extends BaseController {
 	}
 
 	/**
+	 * 保存客户和联系人类型
+	 */
+	@RequiresPermissions(value={"workclientinfo:workClientInfo:add","workclientinfo:workClientInfo:edit"},logical=Logical.OR)
+	@RequestMapping(value = "saveType")
+	public Object saveType(WorkClientInfo workClientInfo,
+					   Model model, RedirectAttributes redirectAttributes,
+//					   @RequestParam(value = "upload_files") MultipartFile[] upload_files.
+					   HttpServletRequest request
+	) throws Exception{
+		if (!beanValidator(model, workClientInfo)){
+			return form(workClientInfo, model);
+		}
+
+		//上传文件
+//		List<WorkClientAttachment> workClientAttachments = workClientInfoService.uploadFile(request, upload_files, workClientInfo.getId(), VarStr.attachmentFlag[0]);
+//		List<WorkClientAttachment> workClientAttachmentList = workClientInfo.getWorkClientAttachmentList();
+//		workClientAttachments.addAll(workClientAttachmentList);
+//		workClientInfo.setWorkClientAttachmentList(workClientAttachments);
+		Map<String,Object> map = new HashMap<>();
+		//保存当前人的公司
+		workClientInfo.setCompanyId(UserUtils.getSelectCompany().getId());
+		workClientInfo.setOfficeId(UserUtils.getSelectOffice().getId());
+		if(!workClientInfo.getIsNewRecord()){//编辑表单保存
+			WorkClientInfo t = workClientInfoService.get(workClientInfo.getId());//从数据库取出记录的值
+			MyBeanUtils.copyBeanNotNull2Bean(workClientInfo, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
+			workClientInfoService.save(t);//保存
+		}else{//新增表单保存
+			workClientInfoService.save(workClientInfo);//保存
+		}
+		map.put("workLinkList",workClientInfo.getWorkClientLinkmanList());
+		addMessage(redirectAttributes, "保存客户管理成功");
+
+		//return "redirect:"+Global.getAdminPath()+"/workclientinfo/workClientInfo/?repage";
+		return map;
+	}
+
+	/**
 	 * 合同新增客户管理
 	 */
 	@RequestMapping(value = "contractsave")
@@ -512,6 +549,7 @@ public class WorkClientInfoController extends BaseController {
 	@RequestMapping("linkmanList")
 	public String queryLinkmanListByClientId(WorkClientLinkman linkman, String url, String fieldLabels, String fieldKeys, String searchLabel, String searchKey, String searchLabel1, String searchKey1, HttpServletRequest request, HttpServletResponse response, Model model){
 		Page<WorkClientLinkman> page = workClientInfoService.findLinkmanPage(new Page<WorkClientLinkman>(request, response), linkman);
+		//Page<WorkClientInfo> page = workClientInfoService.findPageUnit(new Page<WorkClientInfo>(request, response), clientInfo);
 		try {
 			fieldLabels = URLDecoder.decode(fieldLabels, "UTF-8");
 			fieldKeys = URLDecoder.decode(fieldKeys, "UTF-8");
@@ -783,6 +821,7 @@ public class WorkClientInfoController extends BaseController {
 		clientInfo.setCompanyId(UserUtils.getUser().getCompany().getId());
 		linkman.setClientId(clientInfo);
 		Page<WorkClientLinkman> page = workClientInfoService.queryLinkManPageByCompany(new Page<WorkClientLinkman>(request, response), linkman);
+		//Page<WorkClientInfo> page = workClientInfoService.findPageUnit(new Page<WorkClientInfo>(request, response), clientInfo);
 		try {
 			fieldLabels = URLDecoder.decode(fieldLabels, "UTF-8");
 			fieldKeys = URLDecoder.decode(fieldKeys, "UTF-8");

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

@@ -19,6 +19,7 @@
 		a.client_id AS "clientId.id",
 		a.office AS "office",
 		b.name AS "clientId.name"
+
 	</sql>
 	<sql id="linkManColumn">
 		a.id AS "id",
@@ -293,10 +294,11 @@
 		where a.client_id = #{id}
 	</select>
 
-	<select id="queryLinkManByCompany" parameterType="WorkClientLinkman" resultType="WorkClientLinkman">
+	<!--<select id="queryLinkManByCompany" parameterType="WorkClientLinkman" resultType="WorkClientLinkman">
 		select <include refid="workClientLinkmanColumns"/>
 		from work_client_linkman a
 		<include refid="workClientLinkmanJoins"/>
+
 		where
 		a.del_flag = #{DEL_FLAG_NORMAL}
 		<if test="name != null and name != ''">
@@ -307,7 +309,26 @@
 		</if>
 		<if test="clientId != null and clientId.companyId != null and clientId.companyId != ''">
 			AND b.company_id = #{clientId.companyId}
+
+		</if>
+
+	</select>-->
+
+	<select id="queryLinkManByCompany" parameterType="WorkClientLinkman" resultType="WorkClientLinkman">
+		select <include refid="workClientLinkmanColumns"/> ,b.usc_code as UscCode
+		from work_client_linkman a
+		<include refid="workClientLinkmanJoins"/>
+		left join work_client_job_type_info c on c.work_client_id=b.id
+		where
+		a.del_flag = #{DEL_FLAG_NORMAL}
+		<if test="name != null and name != ''">
+			AND a.name LIKE
+			<if test="dbName == 'oracle'">'%'||#{name}||'%'</if>
+			<if test="dbName == 'mssql'">'%'+#{name}+'%'</if>
+			<if test="dbName == 'mysql'">concat('%',#{name},'%')</if>
 		</if>
+		AND c.job_type_id = "1"
+
 
 	</select>
 	<insert id="jobTypeInsert" parameterType="java.util.List">

src/main/webapp/WEB-INF/tags/sys/gridselect1.tag

@@ -25,7 +25,7 @@ function searchGrid${id}(clientId){
 		// top.layer.msg("请先选择合同信息");
 		// top.layer.msg('<span id="confirm" style="border:1px solid red;background:#fff;color:red;margin-left:-25px;padding: 14px 25px 15px 25px;overflow:hidden;position:relative;border-right:none;">请先选择合同信息<b style="position:absolute;top:-1px;width:24px;height:46px;right:-25px;border:1px solid red;border-left:none;background:#fff;"></b></span>')
 		// return false;
-		uri = "${ctx}/workclientinfo/workClientInfo/queryLinkManByCompany?clientId=null";
+		uri = "${ctx}/workclientinfo/workClientInfo/queryLinkManByCompany?clientType=1";
     }else{
 		uri = "${url}?clientIds="+clientId;
 	}

src/main/webapp/webpage/modules/projectrecord/projectRecordsForm.jsp

@@ -543,7 +543,8 @@
                             return false;
                         }
 
-                        addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl);workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
+                        /*addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl);
+                        workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
                         var row = workClientLinkmanRowIdx - 1 ;
 
                         $("#"+"workClientLinkmanList"+row+"_id").val(d.id);
@@ -551,11 +552,11 @@
                         $("#"+"workClientLinkmanList"+row+"_clientName").val(d.clientName);
                         $("#"+"workClientLinkmanList"+row+"_name").val(d.linkName);
                         $("#"+"workClientLinkmanList"+row+"_linkMobile").val(d.linkMobile);
-                        $("#"+"workClientLinkmanList"+row+"_linkPhone").val(d.linkPhone);
-                        if(isMasterClient){
+                        $("#"+"workClientLinkmanList"+row+"_linkPhone").val(d.linkPhone)*/
+                        /*if(isMasterClient){
                             $("#contractClientName").val(d.clientName);
                             isMasterClient = false;
-                        }
+                        }*/
                         parent.layer.msg(d.str,{icon:1});
                         top.layer.close(index)
                     }
@@ -890,7 +891,7 @@
                     <input readonly="true" id="workClientLinkmanList{{idx}}_clientName" name="workClientLinkmanList[{{idx}}].clientId.name" type="text" value="{{row.clientId.name}}"    class="form-control "/>
                 </td>
                 <td>
-                    <input readonly="true" id="workClientLinkmanList{{idx}}_clientUscCode" name="workClientLinkmanList[{{idx}}].clientId.UscCode" type="text" value="{{row.clientId.UscCode}}"    class="form-control "/>
+                    <input readonly="true" id="workClientLinkmanList{{idx}}_uscCode" name="workClientLinkmanList[{{idx}}].uscCode" type="text" value="{{row.uscCode}}"    class="form-control "/>
                 </td>
 
                 <td>
@@ -965,6 +966,7 @@
 						{{row.clientId.name}}
 					</td>
 					 <td style="text-align: center">
+					    <input id="workBuildLinkmanList{{idx}}_cuscCode" name = "workBuildLinkmanList[{{idx}}].clientId.uscCode" type="hidden" value="{{row.clientId.uscCode}}"/>
 						{{row.clientId.uscCode}}
 					</td>
 					<td style="text-align: center">
@@ -1025,6 +1027,7 @@
                         <tr>
                             <th class="hide"></th>
                             <th style="text-align: center" width="20%">施工方单位名称</th>
+                            <th style="text-align: center" width="20%">统一社会信用代码</th>
                             <th style="text-align: center" width="20%">联系人姓名</th>
                             <th style="text-align: center" width="20%">联系方式1</th>
                             <th style="text-align: center" width="20%">联系方式2</th>
@@ -1045,6 +1048,9 @@
 						{{row.clientId.name}}
 					</td>
 					<td style="text-align: center">
+						{{row.clientId.uscCode}}
+					</td>
+					<td style="text-align: center">
 						{{row.name }}
 					</td>
 					<td style="text-align: center">
@@ -1100,6 +1106,7 @@
                         <tr>
                             <th class="hide"></th>
                             <th style="text-align: center" width="20%">监理方单位名称</th>
+                            <th style="text-align: center" width="20%">统一社会信用代码</th>
                             <th style="text-align: center" width="20%">联系人姓名</th>
                             <th style="text-align: center" width="20%">联系方式1</th>
                             <th style="text-align: center" width="20%">联系方式2</th>
@@ -1120,6 +1127,9 @@
 						{{row.clientId.name}}
 					</td>
 					<td style="text-align: center">
+						{{row.clientId.uscCode}}
+					</td>
+					<td style="text-align: center">
 						{{row.name }}
 					</td>
 					<td style="text-align: center">
@@ -1176,6 +1186,7 @@
                         <tr>
                             <th class="hide"></th>
                             <th style="text-align: center" width="20%">设计方单位名称</th>
+                            <th style="text-align: center" width="20%">统一社会信用代码</th>
                             <th style="text-align: center" width="20%">联系人姓名</th>
                             <th style="text-align: center" width="20%">联系方式1</th>
                             <th style="text-align: center" width="20%">联系方式2</th>
@@ -1196,6 +1207,9 @@
 						{{row.clientId.name}}
 					</td>
 					<td style="text-align: center">
+						{{row.clientId.uscCode}}
+					</td>
+					<td style="text-align: center">
 						{{row.name }}
 					</td>
 					<td style="text-align: center">

src/main/webapp/webpage/modules/sys/gridselect1.jsp

@@ -34,7 +34,7 @@
                 var label3 = $(this).parent().parent().parent().find(".codelabel3").html();
                 var label4 = $(this).parent().parent().parent().find(".codelabel4").html();
                 var label5 = $(this).parent().parent().parent().find(".codelabel5").html();
-                var data= {'id':id,'name':label,'linkPhone':label1,'linkMobile':label2,'clientId':{'id':label4,'name':label3,'uscCode':label5}};
+                var data= {'id':id,'name':label,'linkPhone':label1,'linkMobile':label2,'uscCode':label5,'clientId':{'id':label4,'name':label3}};
                 arr.push(data);
 			})
             return arr;
@@ -104,8 +104,7 @@
 							<td> <input type="checkbox" id="${fns:getValue(obj, 'id')}" class="i-checks"></td>
 							<td title="${obj.clientId.id}" class="codelabel4" style="display:none">${obj.clientId.id}</td>
 							<td title="${obj.clientId.name}" class="codelabel3">${obj.clientId.name}</td>
-							<%--<td title="${obj.clientId.uscCode}" class="codelabel5">${obj.clientId.uscCode}</td>--%>
-							<td title="${fns:getValue(obj, 'uscCode')}" class="codelabel5">${fns:getValue(obj, 'uscCode')}</td>
+							<td class="codelabel5">${fns:getValue(obj, 'uscCode')}</td>
 							<c:forEach items="${labelValues}" var="value"  varStatus="status">
 								<c:if test="${status.first==true}">
 									<td title="${fns:getValue(obj, value)}" class="codelabel">${fns:getValue(obj, value)}</td>

src/main/webapp/webpage/modules/sys/gridselectClientDesign.jsp

@@ -31,7 +31,8 @@
                 var label2 = $(this).parent().parent().parent().find(".codelabel2").html();
                 var label3 = $(this).parent().parent().parent().find(".codelabel3").html();
                 var label4 = $(this).parent().parent().parent().find(".codelabel4").html();
-                var data=  {'clientId':{'id':label,'name':label4},'id':id,'name':label1,'linkPhone':label2,'linkMobile':label3};
+                var label5 = $(this).parent().parent().parent().find(".codelabel5").html();
+                var data=  {'clientId':{'id':label,'name':label4,'uscCode':label5},'id':id,'name':label1,'linkPhone':label2,'linkMobile':label3};
                 arr.push(data);
 			})
             return arr;
@@ -86,7 +87,9 @@
 					<tr>
 						<th width="50"><input type="checkbox" class="i-checks"></th>
 						<th style="display:none">设计方编号</th>
+
 						<th width="25%">设计方名称</th>
+						<th width="25%">统一社会信用代码</th>
 						<th width="25%">联系人</th>
 						<th width="25%">联系电话</th>
 						<th width="25%">手机号</th>
@@ -101,7 +104,8 @@
 							<td> <input type="checkbox" id="${fns:getValue(linkman, 'id')}" class="i-checks"></td>
 							<td title="${fns:getValue(obj, 'id')}" class="codelabel" style="display:none">${fns:getValue(obj, 'id')}</td>
 								<td title="${fns:getValue(obj, 'name')}" class="codelabel4">${fns:getValue(obj, 'name')}</td>
-								<td title="${fns:getValue(linkman, 'name')}" class="codelabel1">${fns:getValue(linkman, 'name')}</td>
+							<td title="${fns:getValue(obj, 'uscCode')}" class="codelabel5">${fns:getValue(obj, 'uscCode')}</td>
+							<td title="${fns:getValue(linkman, 'name')}" class="codelabel1">${fns:getValue(linkman, 'name')}</td>
 								<td class="codelabel2">${fns:getValue(linkman, 'linkPhone')}</td>
 								<td class="codelabel3">${fns:getValue(linkman, 'linkMobile')}</td>
 						</tr>

src/main/webapp/webpage/modules/sys/gridselectClientLink.jsp

@@ -31,7 +31,8 @@
                 var label2 = $(this).parent().parent().parent().find(".codelabel2").html();
                 var label3 = $(this).parent().parent().parent().find(".codelabel3").html();
                 var label4 = $(this).parent().parent().parent().find(".codelabel4").html();
-                var data=  {'clientId':{'id':label,'name':label4},'id':id,'name':label1,'linkPhone':label2,'linkMobile':label3};
+                var label5 = $(this).parent().parent().parent().find(".codelabel5").html();
+                var data=  {'clientId':{'id':label,'name':label4,'uscCode':label5},'id':id,'name':label1,'linkPhone':label2,'linkMobile':label3};
                 arr.push(data);
 			})
             return arr;
@@ -87,6 +88,7 @@
 						<th width="50"><input type="checkbox" class="i-checks"></th>
 						<th style="display:none">施工方编号</th>
 						<th width="25%">施工方名称</th>
+						<th width="25%">统一社会信用代码</th>
 						<th width="25%">联系人</th>
 						<th width="25%">联系电话</th>
 						<th width="25%">手机号</th>
@@ -101,6 +103,7 @@
 							<td> <input type="checkbox" id="${fns:getValue(linkman, 'id')}" class="i-checks"></td>
 							<td title="${fns:getValue(obj, 'id')}" class="codelabel" style="display:none">${fns:getValue(obj, 'id')}</td>
 								<td title="${fns:getValue(obj, 'name')}" class="codelabel4">${fns:getValue(obj, 'name')}</td>
+								<td title="${fns:getValue(obj, 'uscCode')}" class="codelabel5">${fns:getValue(obj, 'uscCode')}</td>
 								<td title="${fns:getValue(linkman, 'name')}" class="codelabel1">${fns:getValue(linkman, 'name')}</td>
 								<td class="codelabel2">${fns:getValue(linkman, 'linkPhone')}</td>
 								<td class="codelabel3">${fns:getValue(linkman, 'linkMobile')}</td>

src/main/webapp/webpage/modules/sys/gridselectClientSuper.jsp

@@ -88,6 +88,7 @@
 						<th width="50"><input type="checkbox" class="i-checks"></th>
 						<th style="display:none">监理方编号</th>
 						<th width="25%">监理方名称</th>
+						<th width="25%">统一社会信用代码</th>
 						<th width="25%">联系人</th>
 						<th width="25%">联系电话</th>
 						<th width="25%">手机号</th>
@@ -102,6 +103,7 @@
 							<td> <input type="checkbox" id="${fns:getValue(linkman, 'id')}" class="i-checks"></td>
 							<td title="${fns:getValue(obj, 'id')}" class="codelabel" style="display:none">${fns:getValue(obj, 'id')}</td>
 								<td title="${fns:getValue(obj, 'name')}" class="codelabel4">${fns:getValue(obj, 'name')}</td>
+								<td title="${fns:getValue(obj, 'uscCode')}" class="codelabel5">${fns:getValue(obj, 'uscCode')}</td>
 								<td title="${fns:getValue(linkman, 'name')}" class="codelabel1">${fns:getValue(linkman, 'name')}</td>
 								<td class="codelabel2">${fns:getValue(linkman, 'linkPhone')}</td>
 								<td class="codelabel3">${fns:getValue(linkman, 'linkMobile')}</td>