From 8ddfbbe7721ad55c009ce50a95c14bbfc49c307f Mon Sep 17 00:00:00 2001 From: liuwu <975499773@qq.com> Date: Wed, 15 Nov 2023 11:18:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=89=B9=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E9=A1=B5=E9=9D=A2=E4=B8=8D=E4=B8=80=E8=87=B4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TAmentPartyAffairsController.java | 5 +- .../templates/base/affairs/reviewed.html | 69 ++++++++++--------- .../mapper/base/TAmentPartyAffairsMapper.xml | 1 + 3 files changed, 43 insertions(+), 32 deletions(-) diff --git a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java index a5c12c0..7623542 100644 --- a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java +++ b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java @@ -171,7 +171,10 @@ public class TAmentPartyAffairsController extends BaseController @GetMapping("reviewed") public String reviewed(Long id, ModelMap mmap) { - mmap.put("tAmentPartyAffairs",tAmentPartyAffairsService.selectTAmentPartyAffairsById(id)); + TAmentPartyAffairs affairs = new TAmentPartyAffairs(); + affairs.setId(id); + List list = tAmentPartyAffairsService.selectTAmentPartyAffairsList(affairs); + mmap.put("tAmentPartyAffairs",list.get(0)); return prefix + "/reviewed"; } diff --git a/cyx-admin/src/main/resources/templates/base/affairs/reviewed.html b/cyx-admin/src/main/resources/templates/base/affairs/reviewed.html index 4cb9821..7bbbde3 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/reviewed.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/reviewed.html @@ -6,51 +6,52 @@
-
+
- + +
- +
- +
- +
- +
- +
- +
@@ -62,13 +63,13 @@
- +
- +
@@ -146,28 +147,34 @@ $("#datetimepicker-demo-1").datetimepicker(); + $("input[name='updateTime']").datetimepicker({ + format: "yyyy-mm-dd", + minView: "month", + autoclose: true + }); + $(document).ready(function () { - let _id = parent.parent.a_upload_id; - let header = parent.parent.a_header; - let deptName = parent.parent.a_deptName; - let shotName = parent.parent.a_shotName; - let reviewer = parent.parent.a_reviewer; - let type = parent.parent.a_type; - let demand = parent.parent.a_demand; - let detailed = parent.parent.a_detailed; - let updatetime = parent.parent.a_updatetime; - let score = parent.parent.a_score; - $("#id").val(_id) - $("#reviewer").val(reviewer) - $("#type").val(type) - $("#demand").val(demand) - $("#detailed").val(detailed) - $("#shotName").val(shotName) - $("#header").val(header) - $("#deptName").val(deptName) - $("#commitTime").val(new Date()) - $("#updatetime").val(updatetime) - $("#score").val(score) + // let _id = parent.parent.a_upload_id; + // let header = parent.parent.a_header; + // let deptName = parent.parent.a_deptName; + // let shotName = parent.parent.a_shotName; + // let reviewer = parent.parent.a_reviewer; + // let type = parent.parent.a_type; + // let demand = parent.parent.a_demand; + // let detailed = parent.parent.a_detailed; + // let updatetime = parent.parent.a_updatetime; + // let score = parent.parent.a_score; + // $("#id").val(_id) + // $("#reviewer").val(reviewer) + // $("#type").val(type) + // $("#demand").val(demand) + // $("#detailed").val(detailed) + // $("#shotName").val(shotName) + // $("#header").val(header) + // $("#deptName").val(deptName) + // $("#commitTime").val(new Date()) + // $("#updatetime").val(updatetime) + // $("#score").val(score) }); diff --git a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml index 3720176..06cf16e 100644 --- a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml +++ b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml @@ -550,6 +550,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" remark = #{remark}, files = #{files}, commit_id = #{commitId}, + reviewed_id = #{reviewedId}, status = #{status}, where id = #{id}