Browse Source

合同归档员修改合同案卷号信息

user5 4 years atrás
parent
commit
56f5b64628

+ 6 - 0
src/main/java/com/jeeplus/modules/workcontractinfo/dao/WorkContractInfoDao.java

@@ -69,4 +69,10 @@ public interface WorkContractInfoDao extends CrudDao<WorkContractInfo> {
      * @return
      */
     String getContractLastNum(String contractNum);
+
+    /**
+     * admim修改合同归档案卷号
+     * @param workContractInfo
+     */
+    void updateWorkContractRecord(WorkContractInfo workContractInfo);
 }

+ 18 - 0
src/main/java/com/jeeplus/modules/workcontractinfo/entity/WorkContractInfo.java

@@ -137,6 +137,8 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	private List<String> chargeCriterionList;   //收费标准
 	private String chargeCriterion;   //收费标准Str
 	private String otherDetails;   //其他详情
+	private String fileNum;   //档案号
+	private String fileNumTow;   //确认档案号
 
 	public String getBeginInvestmentAmount() {
 		return beginInvestmentAmount;
@@ -972,4 +974,20 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	public void setChargeCriterion(String chargeCriterion) {
 		this.chargeCriterion = chargeCriterion;
 	}
+
+	public String getFileNum() {
+		return fileNum;
+	}
+
+	public void setFileNum(String fileNum) {
+		this.fileNum = fileNum;
+	}
+
+	public String getFileNumTow() {
+		return fileNumTow;
+	}
+
+	public void setFileNumTow(String fileNumTow) {
+		this.fileNumTow = fileNumTow;
+	}
 }

+ 7 - 0
src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoService.java

@@ -3202,4 +3202,11 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 		return workContractBorrowDao.getLastInfo(contractId);
 	}
 
+	/**
+	 * admin修改合同归档案卷号
+	 */
+	@Transactional(readOnly = false)
+	public void updateWorkContractRecord(WorkContractInfo workContractInfo){
+		dao.updateWorkContractRecord(workContractInfo);
+	}
 }

+ 5 - 0
src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -1042,6 +1042,11 @@ public class WorkContractInfoController extends BaseController {
         MyBeanUtils.copyBeanNotNull2Bean(workContractInfo, t);
         workContractInfoService.save(t);//保存
         workContractInfoService.updateWorkContractInfo(workContractInfo);
+        //admin修改合同归档案卷号
+        //如果案卷号不为空 则进行修改,否则不修改
+        if(StringUtils.isNotBlank(workContractInfo.getFileNum()) && StringUtils.isNotBlank(workContractInfo.getFileNumTow())){
+            workContractInfoService.updateWorkContractRecord(workContractInfo);
+        }
         addMessage(redirectAttributes, "修改合同管理成功");
         return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
     }

+ 11 - 1
src/main/resources/mappings/modules/workcontractinfo/WorkContractInfoDao.xml

@@ -132,9 +132,12 @@
 		a.office_id AS "officeId",
 		a.signature_status as "signatureStatus",
 		a.charge_criterion as "chargeCriterion",
-		a.other_details as "otherDetails"
+		a.other_details as "otherDetails",
+		wcr.file_num as "fileNum",
+		wcr.file_num_tow as "fileNumTow"
 		FROM work_contract_info a
 		<include refid="workContractInfoJoins"/>
+		LEFT JOIN work_contract_record wcr ON wcr.contract_info_id = a.id
 		WHERE a.id = #{id}
 	</select>
 
@@ -1272,4 +1275,11 @@
 		select MAX(contract_num) from work_contract_info where contract_num like concat(#{contractNum},'%')
 	</select>
 
+	<update id="updateWorkContractRecord">
+		UPDATE work_contract_record SET
+		file_num = #{fileNum},
+		file_num_tow = #{fileNumTow}
+		WHERE contract_info_id = #{id}
+	</update>
+
 </mapper>

+ 14 - 0
src/main/webapp/webpage/modules/workcontractinfo/workContractInfoAdminForm.jsp

@@ -638,6 +638,20 @@
 									<form:input path="anotherContractNum" htmlEscape="false" class="form-control layui-input"/>
 								</div>
 							</div>
+							<c:if test="${workContractInfo.fileNum != null}">
+								<div class="layui-item layui-col-sm6">
+									<label class="layui-form-label"><span class="require-item">*</span>案卷号:</label>
+									<div class="layui-input-block">
+										<form:input path="fileNum" htmlEscape="false" class="form-control required layui-input"/>
+									</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">
+										<form:input path="fileNumTow" htmlEscape="false" class="form-control required layui-input"  equalTo="#fileNum"/>
+									</div>
+								</div>
+							</c:if>
 							<div class="layui-item layui-col-sm12">
 								<label class="layui-form-label">收费标准</label>
 								<div class="layui-input-block">