Bladeren bron

审核通过或驳回时,添加审批意见

lizhenhao 2 jaren geleden
bovenliggende
commit
d7c3db3102

+ 3 - 1
src/main/java/com/jeeplus/modules/centerservice/service/cpa/reimbursement/ReimbursementRequest.java

@@ -34,13 +34,15 @@ public class ReimbursementRequest {
      * 报销审核
      * @param id
      * @param flag
+     * @param comment 审核意见
      * @return
      */
-    public Object auditFunc(String id, String flag) {
+    public Object auditFunc(String id, String flag, String comment) {
         String token = "";
         Map<String, Object> bodyMap = new HashMap<>();
         bodyMap.put("id", id);
         bodyMap.put("flag", flag);
+        bodyMap.put("comment", comment);
         Object res = restTemplateService.postCPA("/reimbursement/info/auditFunc", token, null, bodyMap);
         return res;
     }

+ 2 - 2
src/main/java/com/jeeplus/modules/centerservice/service/cpa/reimbursement/ReimbursementService.java

@@ -222,8 +222,8 @@ public class ReimbursementService {
      * 报销审核
      * @return
      */
-    public Map<String,Object> auditFunc(String id,String flag) {
-        Object o = reimbursementRequest.auditFunc(id, flag);
+    public Map<String,Object> auditFunc(String id,String flag,String comment) {
+        Object o = reimbursementRequest.auditFunc(id, flag, comment);
         Map<String,Object> res = JSONObject.parseObject(JSON.toJSONString(o));
         return res;
     }

+ 1 - 1
src/main/java/com/jeeplus/modules/centerservice/web/cpa/reimbursement/ReimbursementController.java

@@ -32,7 +32,7 @@ public class ReimbursementController {
     public String saveAudit(WorkReimbursement workReimbursement, RedirectAttributes redirectAttributes) {
         Map<String, Object> res = new HashMap<>();
         if (Objects.nonNull(workReimbursement.getAct())) {
-            res = reimbursementService.auditFunc(workReimbursement.getId(), workReimbursement.getAct().getFlag());
+            res = reimbursementService.auditFunc(workReimbursement.getId(), workReimbursement.getAct().getFlag(),workReimbursement.getComment());
             addMessage(redirectAttributes, res.get("message").toString());
         } else {
             addMessage(redirectAttributes, "操作失败");

+ 10 - 0
src/main/java/com/jeeplus/modules/workreimbursement/entity/WorkReimbursement.java

@@ -74,6 +74,16 @@ public class WorkReimbursement extends ActEntity<WorkReimbursement> {
 	private String endReimbursementPrice;		//报销结束金额
 	private Date accomplishDate;		//审核通过时间
 	private String sourceType;		// 报销类型
+	private String comment; // 意见
+
+	public String getComment() {
+		return comment;
+	}
+
+	public void setComment(String comment) {
+		this.comment = comment;
+	}
+
 	public String getCreateOffice() {
 		return createOffice;
 	}

+ 9 - 1
src/main/webapp/webpage/modules/workreimbursement/workReimbursementAuditCpa.jsp

@@ -133,9 +133,10 @@
 			<div class="layui-item layui-col-sm12 with-textarea">
 				<label class="layui-form-label ">备注:</label>
 				<div class="layui-input-block">
-					<form:textarea path="remarks" placeholder="请输入备注" htmlEscape="false" rows="4"  maxlength="255" value="${workReimbursement.remarks}"  class="form-control "/>
+					<form:textarea path="remarks" placeholder="请输入备注" htmlEscape="false" rows="4" readonly="true" maxlength="255" value="${workReimbursement.remarks}"  class="form-control "/>
 				</div>
 			</div>
+
 		</div>
 		<div class="form-group layui-row">
 			<div class="form-group-label"><h2>报销详情</h2></div>
@@ -355,6 +356,13 @@
 				</table>
 			</div>
 		</div>
+
+		<div class="layui-item layui-col-sm12 with-textarea">
+			<label class="layui-form-label ">审批意见:</label>
+			<div class="layui-input-block">
+				<form:textarea path="comment" placeholder="请输入审批意见" htmlEscape="false" rows="8"  maxlength="255" value="${workReimbursement.comment}"  class="form-control "/>
+			</div>
+		</div>
 		<div class="form-group layui-row">
 			<div class="form-group-label"><h2>${projectNotifyType}&nbsp;审批流程</h2></div>
 			<div class="layui-item layui-col-xs12 form-table-container" >