FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add: 政策课题模块增删改查修改

Browse Source
This commit is contained in:
wxyclub
2023-10-18 15:15:10 +08:00
parent 4621286ca5
commit ffefa7fcde
5 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java
+2 -2
View File
@@ -51,14 +51,14 @@ public class SarLawsTopic implements Serializable {
/**
* 开始时间
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@TableField(value = "START_TIME")
private Date startTime;
/**
* 结题时间
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@TableField(value = "CLOSE_TIME")
private Date closeTime;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicMeeting.java
+1 -2
View File
@@ -38,9 +38,8 @@ public class SarLawsTopicMeeting implements Serializable {
/**
* 会议时间
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(value = "MEETING_TIME")
private Date meetingTime;
private String meetingTime;
/**
* 会议地点
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicVO.java
+6 -4
View File
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
@@ -46,13 +47,15 @@ public class SarLawsTopicVO extends BasePage {
/**
* 开始时间
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date startTime;
/**
* 结题时间
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date closeTime;
/**
@@ -83,8 +86,7 @@ public class SarLawsTopicVO extends BasePage {
/**
* 会议时间
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date meetingTime;
private String meetingTime;
/**
* 会议地点
adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml
+8 -8
View File
@@ -10,8 +10,8 @@
<result property="organizer" column="ORGANIZER" jdbcType="VARCHAR"/>
<result property="guidanceUnit" column="GUIDANCE_UNIT" jdbcType="VARCHAR"/>
<result property="participatingUnit" column="PARTICIPATING_UNIT" jdbcType="VARCHAR"/>
<result property="startTime" column="START_TIME" jdbcType="TIMESTAMP"/>
<result property="closeTime" column="CLOSE_TIME" jdbcType="TIMESTAMP"/>
<result property="startTime" column="START_TIME" jdbcType="DATE"/>
<result property="closeTime" column="CLOSE_TIME" jdbcType="DATE"/>
<result property="topicStatus" column="TOPIC_STATUS" jdbcType="VARCHAR"/>
<result property="topicCost" column="TOPIC_COST" jdbcType="VARCHAR"/>
<result property="agreement" column="AGREEMENT" jdbcType="VARCHAR"/>
@@ -28,8 +28,8 @@
<result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
<result property="modifyTime" column="MODIFY_TIME" jdbcType="TIMESTAMP"/>
<collection property="meetingList" ofType="com.adc.da.slrs.sarLawsTopic.entity.SarLawsTopicMeeting">
<id property="id" column="ID" jdbcType="VARCHAR"/>
<result property="lawsTopicId" column="LAWS_TOPIC_ID"/>
<id property="id" column="sltmId" jdbcType="VARCHAR"/>
<result property="lawsTopicId" column="sltmLawsTopicId"/>
<result property="meetingName" column="MEETING_NAME"/>
<result property="meetingTime" column="MEETING_TIME"/>
<result property="meetingAddress" column="MEETING_ADDRESS"/>
@@ -71,8 +71,8 @@
slt.ID,slt.TOPIC_NAME,slt.ORGANIZER,
slt.GUIDANCE_UNIT,slt.PARTICIPATING_UNIT,slt.START_TIME,
slt.CLOSE_TIME,slt.TOPIC_STATUS,slt.TOPIC_COST,slt.AGREEMENT,
sltm.ID,
sltm.LAWS_TOPIC_ID,
sltm.ID as sltmId,
sltm.LAWS_TOPIC_ID as sltmLawsTopicId,
sltm.MEETING_NAME,
sltm.MEETING_TIME,
sltm.MEETING_ADDRESS,
@@ -114,10 +114,10 @@
<if test="participatingUnit != null and participatingUnit != ''" >
and PARTICIPATING_UNIT like concat('%',#{participatingUnit},'%')
</if>
<if test="startTime != null and startTime !=''">
<if test="startTime != null">
and START_TIME ${startTimeOperator} #{startTime}
</if>
<if test="closeTime != null and closeTime !=''">
<if test="closeTime != null">
and CLOSE_TIME ${startTimeOperator} #{closeTime}
</if>
<if test="topicStatus != null and topicStatus != ''" >
adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMeetingMapper.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<id property="id" column="ID" jdbcType="VARCHAR"/>
<result property="lawsTopicId" column="LAWS_TOPIC_ID" jdbcType="VARCHAR"/>
<result property="meetingName" column="MEETING_NAME" jdbcType="VARCHAR"/>
<result property="meetingTime" column="MEETING_TIME" jdbcType="TIMESTAMP"/>
<result property="meetingTime" column="MEETING_TIME" jdbcType="VARCHAR"/>
<result property="meetingAddress" column="MEETING_ADDRESS" jdbcType="VARCHAR"/>
<result property="participants" column="PARTICIPANTS" jdbcType="VARCHAR"/>
<result property="meetingContent" column="MEETING_CONTENT" jdbcType="VARCHAR"/>