合同，张安然需要的修改合同规模功能调整

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

@@ -42,6 +42,7 @@ public interface WorkContractInfoDao extends CrudDao<WorkContractInfo> {
 
     public void deleteFile(String id);
     public int saveContractPrice(WorkContractInfo workContractInfo);
+    public int updateContractScale(WorkContractInfo workContractInfo);
     public List<WorkContractInfo> findByList(WorkContractInfo workContractInfo);
 
     int updateInvalidateProcessInstanceId(WorkContractInfo workContractInfo);

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

@@ -513,7 +513,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 		this.contractSpecial = contractSpecial;
 	}
 
-	@ExcelField(title="合同状态", dictType="audit_state", align=2, sort=13)
+	@ExcelField(title="合同状态", dictType="audit_state", align=2, sort=14)
 	public String getContractState() {
 		return contractState;
 	}
@@ -935,7 +935,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 		this.signatureStatus = signatureStatus;
 	}
 
-	@ExcelField(title="归档状态", dictType="archive_state", align=2, sort=14)
+	@ExcelField(title="归档状态", dictType="archive_state", align=2, sort=15)
 	public String getContrractRecordStatus() {
 		return contrractRecordStatus;
 	}
@@ -952,7 +952,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 		this.contrractRecordId = contrractRecordId;
 	}
 
-	@ExcelField(title="案卷号", align=2, sort=15)
+	@ExcelField(title="案卷号", align=2, sort=16)
 	public String getRecordNum() {
 		return recordNum;
 	}
@@ -1035,7 +1035,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 		this.chargeCriterionList = chargeCriterionList;
 	}
 
-	@ExcelField(title="收费标准", align=2, sort=12)
+	@ExcelField(title="收费标准", align=2, sort=13)
 	public String getOtherDetails() {
 		return otherDetails;
 	}
@@ -1411,6 +1411,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 		this.isProject = isProject;
 	}
 
+	@ExcelField(title="合同规模", align=2, sort=12)
 	public String getContractScale() {
 		return contractScale;
 	}

src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoService.java

@@ -578,6 +578,11 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 	}
 
 	@Transactional(readOnly = false)
+	public int updateContractScale(WorkContractInfo workContractInfo) {
+		return dao.updateContractScale(workContractInfo);
+	}
+
+	@Transactional(readOnly = false)
 	public void save(WorkContractInfo workContractInfo) {
 		if(null != workContractInfo.getChargeCriterionList() && workContractInfo.getChargeCriterionList().size()>0){
 			String chargeCriterion = String.join(",", workContractInfo.getChargeCriterionList());

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

@@ -1383,6 +1383,31 @@ public class WorkContractInfoController extends BaseController {
     }
 
     /**
+     * 修改合同规模 - 表单页面
+     */
+    @RequiresPermissions("workcontractinfo:workContractInfo:editScale")
+    @RequestMapping(value = "scaleForm")
+    public String scaleForm(WorkContractInfo workContractInfo, Model model) {
+        model.addAttribute("workContractInfo", workContractInfo);
+        return "modules/workcontractinfo/workContractInfoScaleForm";
+    }
+
+    /**
+     * 修改合同规模 - 保存
+     */
+    @RequiresPermissions("workcontractinfo:workContractInfo:editScale")
+    @RequestMapping(value = "updateContractScale")
+    public String updateContractScale(WorkContractInfo workContractInfo, Model model, RedirectAttributes redirectAttributes) {
+        WorkContractInfo t = workContractInfoService.get(workContractInfo.getId());
+        t.setContractScale(workContractInfo.getContractScale());
+        t.setUpdateBy(UserUtils.getUser());
+        t.setUpdateDate(new Date());
+        workContractInfoService.updateContractScale(t);
+        addMessage(redirectAttributes, "修改合同规模成功");
+        return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfoAll/?repage";
+    }
+
+    /**
      * 修改合同金额
      */
     @RequestMapping(value = "saveContractPrice")

src/main/resources/mappings/modules/workcontractinfo/WorkContractInfoDao.xml

@@ -1364,6 +1364,14 @@
 		WHERE id = #{id}
 	</update>
 
+	<update id="updateContractScale">
+		UPDATE work_contract_info SET
+		contract_scale = #{contractScale},
+		update_by = #{updateBy.id},
+		update_date = #{updateDate}
+		WHERE id = #{id}
+	</update>
+
 	<update id="updatealterProcessInstanceId">
 		UPDATE work_contract_info SET
 		alter_process_instance_id = #{alterProcessInstanceId}

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

@@ -698,6 +698,13 @@
 									<form:input path="anotherContractNum" htmlEscape="false" class="form-control layui-input"/>
 								</div>
 							</div>
+
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">合同规模：</label>
+								<div class="layui-input-block">
+									<form:input path="contractScale" placeholder="请输入合同规模" 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>

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

@@ -784,6 +784,9 @@
 						if(d.updateAdmin != undefined && d.updateAdmin == "1" ){
 							xml +="<a href=\"javascript:void(0)\" onclick=\"contractAdminUpdate('修改合同管理', '${ctx}/workcontractinfo/workContractInfo/adminForm?id=" + d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改合同</a>";
 						}
+						if(d.editScale != undefined && d.editScale == "1" ){
+							xml +="<a href=\"javascript:void(0)\" onclick=\"contractAdminUpdate('修改合同规模', '${ctx}/workcontractinfo/workContractInfo/scaleForm?id=" + d.id + "','50%','60%')\" class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 修改合同规模</a>";
+						}
                         if(d.status != 5){
 							/*if(d.signature != undefined && d.signature =="1")
                                                     {
@@ -964,6 +967,9 @@
 							<c:when test="${workContractInfo.contractState == 5 }">,"updateAdmin":"1"</c:when>
 						</c:choose>
 					</shiro:hasPermission>
+					<shiro:hasPermission name="workcontractinfo:workContractInfo:editScale">
+						,"editScale":"1"
+					</shiro:hasPermission>
 					<shiro:hasPermission name="workcontractrecord:workContractRecord:revert">,"giveBorrow":	<c:choose><c:when test="${workContractInfo.borrowStatus == '5' && workContractInfo.giveStatus != '5'}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
 					<shiro:hasPermission name="workcontractinfo:workContractInfo:leader">,
 					"leader":"1"