客户页面添加代表方展示字段

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

@@ -550,4 +550,4 @@ public class WorkClientInfo extends DataEntity<WorkClientInfo> {
 	public void setJobTypeShow(Integer jobTypeShow) {
 		this.jobTypeShow = jobTypeShow;
 	}
-}
+}

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

@@ -799,4 +799,4 @@ public class WorkClientInfoService extends CrudService<WorkClientInfoDao, WorkCl
         return work;
 
     }
-}
+}

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

@@ -2,43 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jeeplus.modules.workclientinfo.dao.WorkClientInfoDao">
 
-	<sql id="workClientInfoColumnsJoinLink">
-		a.id AS "id",
-		a.create_by AS "createBy.id",
-		a.create_date AS "createDate",
-		a.update_by AS "updateBy.id",
-		a.update_date AS "updateDate",
-		a.del_flag AS "delFlag",
-		a.name AS "name",
-		a.name_for_short AS "nameForShort",
-		a.or_unicode AS "orUnicode",
-		a.company_type AS "companyType",
-		a.company_industry AS "companyIndustry",
-		a.client_type AS "clientType",
-		a.credit_rank AS "creditRank",
-		a.area_id AS "area.id",
-		a.zip_code AS "zipCode",
-		a.fax AS "fax",
-		a.lawer_presint AS "lawerPresint",
-		a.tax_id AS "taxId",
-		a.email AS "email",
-		a.address AS "address",
-		a.register_address AS "registerAddress",
-		a.company_url AS "companyUrl",
-		a.remarks AS "unitIntroduction",
-		a.has_uscc AS "hasUscc",
-		a.usc_code AS "uscCode",
-		area.name AS "area.name",
-		b.id AS "workClientLinkman.id",
-		b.name AS "workClientLinkman.name",
-		b.link_mobile AS "workClientLinkman.linkMobile",
-		b.link_phone AS "workClientLinkman.linkPhone",
-		a.company_id AS "companyId",
-		a.telephone AS "telephone"
-	</sql>
-
 	<sql id="workClientInfoColumns">
-		a.id AS "id",
+		distinct a.id AS "id",
 		a.create_by AS "createBy.id",
 		a.create_date AS "createDate",
 		a.update_by AS "updateBy.id",
@@ -109,8 +74,8 @@
 
 	<select id="findList" resultType="WorkClientInfo" >
 		SELECT
-		su.name as "userName",
 			<include refid="workClientInfoColumns"/>
+			,su.name as "userName"
 		FROM work_client_info a
 		<include refid="workClientInfoJoinsLink"/>
 		left join sys_user su on su.id = a.create_by
@@ -189,7 +154,7 @@
 
     <select id="queryCount" resultType="int" >
         SELECT
-        count(1)
+        count(distinct a.id)
         FROM work_client_info a
         <if test="workClientLinkman != null and workClientLinkman.name !=null and workClientLinkman.name !=''">
             LEFT JOIN work_client_linkman b ON a.id = b.client_id

src/main/webapp/webpage/modules/projectrecord/implementStage/projectDesignChangeForm.jsp

@@ -550,7 +550,7 @@
                     </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">
                         <div id="jobType" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/view/workClientAndContractView.jsp

@@ -103,7 +103,7 @@
                 </div>
             </div>
 <%--            <div class="layui-item layui-col-sm6 lw7">--%>
-<%--                <label class="layui-form-label">代表单位：</label>--%>
+<%--                <label class="layui-form-label">代表方：</label>--%>
 <%--                <div class="layui-input-block">--%>
 <%--                    <div class="input-group">--%>
 <%--                        <div >--%>

src/main/webapp/webpage/modules/workclientinfo/workClientInfoForm.jsp

@@ -528,7 +528,7 @@
                     </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">
                         <div id="jobType" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
                     </div>

src/main/webapp/webpage/modules/workclientinfo/workClientInfoFormDetail.jsp

@@ -60,7 +60,7 @@
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
-                <label class="layui-form-label">代表单位：</label>
+                <label class="layui-form-label">代表方：</label>
                 <div class="layui-input-block">
                     <div class="input-group">
                         <div >

src/main/webapp/webpage/modules/workclientinfo/workClientInfoFormTwo.jsp

@@ -487,7 +487,7 @@
                     </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">
                         <div id="jobType" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
                     </div>

src/main/webapp/webpage/modules/workclientinfo/workClientInfoFormType.jsp

@@ -494,7 +494,7 @@
                     </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">
                         <div id="jobType" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
                     </div>

src/main/webapp/webpage/modules/workclientinfo/workClientInfoList.jsp

@@ -225,7 +225,7 @@
 							</div>
 						</div>
 						<div class="layui-item query athird">
-							<label class="layui-form-label">代表单位：</label>
+							<label class="layui-form-label">代表方：</label>
 							<div class="layui-input-block">
 								<form:select path="jobTypeShow" class="form-control layui-input">
 									<form:option value="" label=""/>
@@ -299,6 +299,9 @@
                             "<span title=" + d.clientName + ">" + d.clientName.substr(0,40) + "</span></a>";
                         return xml;
                     }}
+                ,{field:'jobTypeStr',align:'center', title: '代表方',width:100,templet:function(d){
+						return "<span title='"+ d.jobTypeStr +"'>" + d.jobTypeStr + "</span>";
+					}}
                 ,{field:'clientProperty',align:'center', title: '客户性质',width:100}
                 ,{field:'trade',align:'center', title: '客户行业', width:80}
                 ,{field:'area', align:'center',title: '所在地区',width:80}
@@ -308,7 +311,7 @@
                 ,{field:'code', align:'center',title: '统一社会信用代码',width:160,templet:function(d){
                         return "<span title='"+ d.code +"'>" + d.code + "</span>";
                     }}
-				/*,{field:'jobTypeStr', align:'center',title: '代表单位',width:80}*/
+				/*,{field:'jobTypeStr', align:'center',title: '代表方',width:80}*/
                 ,{field:'userName',align:'center', title: '创建人', width:80}
                 ,{field:'createDate',align:'center', title: '创建时间', width:80}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
@@ -340,6 +343,7 @@
                     ,"area":"${workClientInfo.area.name}"
                     ,"clientType":"${fns:getMainDictLabels(workClientInfo.clientType,',','client_type', '')}"
                     ,"code":"${workClientInfo.uscCode}"
+                    ,"jobTypeStr":"${workClientInfo.jobTypeStr}"
                     ,"createDate":"<fmt:formatDate value="${workClientInfo.createDate}" pattern="yyyy-MM-dd"/>"
                     <c:if test="${flag == '1' or fns:getUser().id == workClientInfo.createBy.id}">
                     <shiro:hasPermission name="workclientinfo:workClientInfo:edit">,"canedit":"1"</shiro:hasPermission>

src/main/webapp/webpage/modules/workclientinfo/workClientTypeForm.jsp

@@ -291,7 +291,7 @@
                                     /*var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
                                     top.layer.close(index);*/
                                 }else{
-                                    layer.confirm('该客户已存在是否添加代表单位类型？', {
+                                    layer.confirm('该客户已存在是否添加代表方类型？', {
                                         btn: ['确定', '取消'] //可以无限个按钮
 
                                     }, function(index, layero){
@@ -628,7 +628,7 @@
                     </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">
                         <div id="jobType" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
                     </div>