合同信息修改

src/main/java/com/jeeplus/modules/workcontractinfo/dao/WorkContractInfoDao.java

@@ -113,7 +113,7 @@ public interface WorkContractInfoDao extends CrudDao<WorkContractInfo> {
      * @param contractNum
      * @return
      */
-    List<WorkClientLinkman> getList(String contractNum);
+    List<WorkClientLinkman> getList(String contractId);
     /**
      * 修改联系人信息
      * @param workClientLinkman

src/main/java/com/jeeplus/modules/workcontractinfo/entity/WorkContractInfo.java

@@ -64,7 +64,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	private String telephone;
 	private String uscCode;
 	private Area area;		// 地区Id
-	private int hasUscc; //是否拥有统一社会信用代码
+	private Integer hasUscc; //是否拥有统一社会信用代码
 	private WorkClientInfo workClientInfo; //客户管理
 	private WorkClientLinkman workClientLinkman;        //联系人信息
 	private List<WorkClientLinkman> workClientLinkmanList = Lists.newArrayList();		// 子表列表
@@ -235,11 +235,11 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	public void setBeginInvestmentAmount(String beginInvestmentAmount) {
 		this.beginInvestmentAmount = beginInvestmentAmount;
 	}
-	public int getHasUscc() {
+	public Integer getHasUscc() {
 		return hasUscc;
 	}
 
-	public void setHasUscc(int hasUscc) {
+	public void setHasUscc(Integer hasUscc) {
 		this.hasUscc = hasUscc;
 	}
 	public String getEndInvestmentAmount() {

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -546,6 +546,9 @@ public class WorkContractInfoController extends BaseController {
         if(StringUtils.isBlank(workContractInfo.getCompany())){
             workContractInfo.setCompany("0");
         }
+        if(null == workContractInfo.getHasUscc()){
+            workContractInfo.setHasUscc(1);
+        }
 //        workContractInfo.getWorkClientLinkmanList().forEach(w->{
 //            System.out.println(w.getName() + "---" + w.getEmail());
 //        });
@@ -562,7 +565,7 @@ public class WorkContractInfoController extends BaseController {
             workContractInfo.setChargeCriterionList(Arrays.asList(workContractInfo.getChargeCriterion().split(",")));
         }
         //获得联系人集合
-        workContractInfo.setWorkClientLinkmanList(workContractInfoService.getClientList(workContractInfo.getContractNum()));
+        workContractInfo.setWorkClientLinkmanList(workContractInfoService.getClientList(workContractInfo.getId()));
 //        System.out.println(workContractInfoService.getClientList(workContractInfo.getContractNum()));
         model.addAttribute("workContractInfo", workContractInfo);
         return "modules/workcontractinfo/workContractInfoAdminForm";

src/main/webapp/webpage/modules/workcontractinfo/newWorkContract/workContractInfoFormAdd.jsp

@@ -75,6 +75,17 @@
             return false;
         }
         $(document).ready(function() {
+
+
+			var span = '${workContractInfo.hasUscc}';
+			if("2"==span){
+				$(".companyType_uscCode").hide();
+				$('input[name="uscCode"]').val("");
+			}else {
+				$(".companyType_uscCode").show();
+			}
+
+
 			var chargeCriterionH = $("#chargeCriterionH").val();
 			/*if(chargeCriterionH.indexOf("4")!=-1){
 				// document.getElementById("otherDetails").readOnly=false
@@ -693,8 +704,8 @@
 								<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">&nbsp;&nbsp;
-										<form:radiobutton id="hasUscc" class="" name="hasUscc" path="" lay-filter="hasUscc" value="1" label="是" checked="true" />
-										<form:radiobutton id="hasUscc" class="" name="hasUscc" path="" lay-filter="hasUscc" value="2" label="否" />
+										<input type="radio" name="hasUscc" value="1" title="是"  lay-filter="hasUscc" <c:if test="${workContractInfo.hasUscc=='1'}">checked</c:if>>
+										<input type="radio" name="hasUscc" value="2" title="否"  lay-filter="hasUscc" <c:if test="${workContractInfo.hasUscc=='2'}">checked</c:if> >
 									</div>
 								</div>
 								<div class="layui-item layui-col-sm6 lw7 companyType_uscCode">

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoAdminForm.jsp

@@ -713,6 +713,13 @@
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label"><span class="require-item">*</span>单位：</label>
+								<div class="layui-input-block">
+									<input type="radio" name="company" value="0" title="东兴"<c:if test="${workContractInfo.company=='0'}">checked</c:if>>
+									<input type="radio" name="company" value="1" title="赣能"<c:if test="${workContractInfo.company=='1'}">checked</c:if> >
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label">对方合同编号：</label>
 								<div class="layui-input-block">
 									<form:input path="anotherContractNum" htmlEscape="false" class="form-control layui-input"/>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoLookForm.jsp

@@ -148,14 +148,10 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw7">
-							<br>
 							<label class="layui-form-label double-line">拥有统一社会信用代码：</label>
 							<div class="layui-input-block">
-                    <span class="radio-box">&nbsp;&nbsp;
-                        <input type="radio" class="usccClass" name="hasUscc" label="是" disabled="true" <c:if test="${workContractInfo.hasUscc eq 1}">checked="true"</c:if> />是
-                        &nbsp;&nbsp;
-                        <input type="radio" class="usccClass" name="hasUscc" label="否" disabled="true" <c:if test="${workContractInfo.hasUscc eq 2}">checked="true"</c:if> />否
-                    </span>
+								<input type="radio" name="hasUscc" value="1" title="是" disabled <c:if test="${workContractInfo.hasUscc=='1'}">checked</c:if>>
+								<input type="radio" name="hasUscc" value="2" title="否" disabled <c:if test="${workContractInfo.hasUscc=='2'}">checked</c:if> >
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw7">

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordAudit.jsp

@@ -177,8 +177,8 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">单位：</label>
 					<div class="layui-input-block">
-						<input type="radio" name="company" value="0" title="东兴" disabled <c:if test="${workContractRecord.workContractInfo.company=='0'}">checked</c:if>>
-						<input type="radio" name="company" value="1" title="赣能" disabled <c:if test="${workContractRecord.workContractInfo.company=='1'}">checked</c:if> >
+						<input type="radio" name="workContractRecord.workContractInfo.company" value="0" title="东兴" disabled <c:if test="${workContractRecord.workContractInfo.company=='0'}">checked</c:if>>
+						<input type="radio" name="workContractRecord.workContractInfo.company" value="1" title="赣能" disabled <c:if test="${workContractRecord.workContractInfo.company=='1'}">checked</c:if> >
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">