From fa579b077d8cf5e585c1e752d1198bf0cc6a1fe5 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 7 Jun 2024 14:08:29 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=A7=94=E5=91=98=E4=BC=9A=EF=BC=8C?=
 =?UTF-8?q?=E5=A7=94=E5=91=98=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/24年6月变更.sql                            |  3 +++
 .../PayCommitteeInfoController.java           | 22 +++++++++++--------
 .../PayCommitteeMemberInfoController.java     | 15 ++++++++++---
 .../committee/entity/PayCommitteeInfo.java    | 11 ++++++++++
 .../entity/PayCommitteeMemberInfo.java        | 13 ++++++++++-
 .../service/PayCommitteeInfoService.java      | 15 ++++++++++++-
 6 files changed, 65 insertions(+), 14 deletions(-)

diff --git a/db/24年6月变更.sql b/db/24年6月变更.sql
index d45e9c89..0874ac00 100644
--- a/db/24年6月变更.sql
+++ b/db/24年6月变更.sql
@@ -32,6 +32,7 @@ create table pay_committee_info
     preparation_unit                   varchar(100) null comment '筹建单位',
     committee_name                     varchar(100) null comment '委员会名称',
     member_number                      int          null comment '委员数量',
+    del_flag                           int          null comment '逻辑删除标识',
     constraint Index_1
         unique (id)
 )
@@ -85,6 +86,8 @@ create table pay_committee_member_info
     other_languages_and_proficiency_levels varchar(100) null comment '其他语言及熟练程度',
     is_academician                         varchar(100) null comment '是否工程院院士',
     is_academy_of_sciences                 varchar(100) null comment '是否科学院院士',
+    del_flag                               int          null comment '逻辑删除标识',
+
     constraint Index_1
         unique (id)
 )
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/committee/controller/PayCommitteeInfoController.java b/jero-boot-incoming-payment/src/main/java/com/jero/committee/controller/PayCommitteeInfoController.java
index b792c6f2..518adc18 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/committee/controller/PayCommitteeInfoController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/committee/controller/PayCommitteeInfoController.java
@@ -7,6 +7,7 @@ import com.jero.committee.entity.PayCommitteeInfo;
 import com.jero.committee.service.PayCommitteeInfoService;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.constant.CommonConstant;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
@@ -50,6 +51,9 @@ public class PayCommitteeInfoController extends JeroController<PayCommitteeInfo,
                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                          HttpServletRequest req) {
         QueryWrapper<PayCommitteeInfo> queryWrapper = QueryGenerator.initQueryWrapper(payCommitteeInfo, req.getParameterMap());
+        queryWrapper.lambda()
+                .eq(PayCommitteeInfo::getDelFlag, CommonConstant.DEL_FLAG_0)
+                .orderByAsc(PayCommitteeInfo::getCommitteeNumber);
         Page<PayCommitteeInfo> page = new Page<>(pageNo, pageSize);
         IPage<PayCommitteeInfo> pageList = payCommitteeInfoService.page(page, queryWrapper);
         return Result.OK(pageList);
@@ -68,15 +72,6 @@ public class PayCommitteeInfoController extends JeroController<PayCommitteeInfo,
         }
         return Result.OK(payCommitteeInfo);
     }
-
-    /**
-     * 导出excel
-     */
-    //@ApiOperation(value = "委员会表-导出excel")
-    //@GetMapping(value = "/exportXls")
-    //public ModelAndView exportXls(HttpServletRequest request, PayCommitteeInfo payCommitteeInfo) {
-    //    return super.exportXls(request, payCommitteeInfo, PayCommitteeInfo.class, "委员会表");
-    //}
     /**
      * 同步数据
      */
@@ -86,4 +81,13 @@ public class PayCommitteeInfoController extends JeroController<PayCommitteeInfo,
         payCommitteeInfoService.sync();
     }
 
+    ///**
+    // * 导出excel
+    // */
+    //@ApiOperation(value = "委员会表-导出excel")
+    //@GetMapping(value = "/exportXls")
+    //public ModelAndView exportXls(HttpServletRequest request, PayCommitteeInfo payCommitteeInfo) {
+    //    return super.exportXls(request, payCommitteeInfo, PayCommitteeInfo.class, "委员会表");
+    //}
+
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/committee/controller/PayCommitteeMemberInfoController.java b/jero-boot-incoming-payment/src/main/java/com/jero/committee/controller/PayCommitteeMemberInfoController.java
index 41b51373..a5b8942d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/committee/controller/PayCommitteeMemberInfoController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/committee/controller/PayCommitteeMemberInfoController.java
@@ -8,6 +8,7 @@ import com.jero.committee.entity.PayCommitteeMemberInfo;
 import com.jero.committee.service.PayCommitteeMemberInfoService;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.constant.CommonConstant;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
@@ -51,7 +52,15 @@ public class PayCommitteeMemberInfoController extends JeroController<PayCommitte
                                                                @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                                HttpServletRequest req) {
+
         QueryWrapper<PayCommitteeMemberInfo> queryWrapper = QueryGenerator.initQueryWrapper(payCommitteeMemberInfo, req.getParameterMap());
+        String committeeNumber = payCommitteeMemberInfo.getCommitteeNumber();
+        String positionOfStandardsCommittee = payCommitteeMemberInfo.getPositionOfStandardsCommittee();
+        queryWrapper.lambda()
+                .eq(PayCommitteeMemberInfo::getCommitteeNumber,committeeNumber)
+                .eq(PayCommitteeMemberInfo::getDelFlag, CommonConstant.DEL_FLAG_0)
+                .eq(StringUtils.isNotBlank(positionOfStandardsCommittee), PayCommitteeMemberInfo::getPositionOfStandardsCommittee, positionOfStandardsCommittee)
+                .orderByAsc(PayCommitteeMemberInfo::getNumber);
         Page<PayCommitteeMemberInfo> page = new Page<>(pageNo, pageSize);
         IPage<PayCommitteeMemberInfo> pageList = payCommitteeMemberInfoService.page(page, queryWrapper);
         for (PayCommitteeMemberInfo record : pageList.getRecords()) {
@@ -86,9 +95,9 @@ public class PayCommitteeMemberInfoController extends JeroController<PayCommitte
         return Result.OK(payCommitteeMemberInfo);
     }
 
-    /**
-     * 导出excel
-     */
+    ///**
+    // * 导出excel
+    // */
     //@ApiOperation(value = "委员会成员表-导出excel")
     //@GetMapping(value = "/exportXls")
     //public ModelAndView exportXls(HttpServletRequest request, PayCommitteeMemberInfo payCommitteeMemberInfo) {
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/committee/entity/PayCommitteeInfo.java b/jero-boot-incoming-payment/src/main/java/com/jero/committee/entity/PayCommitteeInfo.java
index cc9d18b4..b7cfe098 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/committee/entity/PayCommitteeInfo.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/committee/entity/PayCommitteeInfo.java
@@ -5,11 +5,13 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
   *
@@ -69,6 +71,8 @@ public class PayCommitteeInfo {
     /**
      * 本届批准时间
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @TableField(value = "approval_time_for_this_session")
     @ApiModelProperty(value = "本届批准时间")
     private Date approvalTimeForThisSession;
@@ -104,6 +108,8 @@ public class PayCommitteeInfo {
     /**
      * 第一届成立时间
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @TableField(value = "first_establishment_date")
     @ApiModelProperty(value = "第一届成立时间")
     private Date firstEstablishmentDate;
@@ -239,4 +245,9 @@ public class PayCommitteeInfo {
     @TableField(value = "member_number")
     @ApiModelProperty(value = "委员数量")
     private Integer memberNumber;
+    /**
+     * 删除标识
+     */
+    @ApiModelProperty(value = "删除标识")
+    private Integer delFlag;
 }
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/committee/entity/PayCommitteeMemberInfo.java b/jero-boot-incoming-payment/src/main/java/com/jero/committee/entity/PayCommitteeMemberInfo.java
index 76af1ba4..b2831651 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/committee/entity/PayCommitteeMemberInfo.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/committee/entity/PayCommitteeMemberInfo.java
@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
   *
@@ -82,6 +84,8 @@ public class PayCommitteeMemberInfo {
     /**
      * 参加委员会时间
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @TableField(value = "committee_participation_time")
     @ApiModelProperty(value = "参加委员会时间")
     private Date committeeParticipationTime;
@@ -138,6 +142,8 @@ public class PayCommitteeMemberInfo {
     /**
      * 聘书有效期
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @TableField(value = "validity_period_of_employment_letter")
     @ApiModelProperty(value = "聘书有效期")
     private Date validityPeriodOfEmploymentLetter;
@@ -298,7 +304,6 @@ public class PayCommitteeMemberInfo {
      * 是否工程院院士
      */
     @TableField(value = "is_academician")
-    @Dict(dicCode = "yn")
     @ApiModelProperty(value = "是否工程院院士")
     private String isAcademician;
     /**
@@ -307,4 +312,10 @@ public class PayCommitteeMemberInfo {
     @TableField(value = "is_academy_of_sciences")
     @ApiModelProperty(value = "是否科学院院士")
     private String isAcademyOfSciences;
+
+    /**
+     * 删除标识
+     */
+    @ApiModelProperty(value = "删除标识")
+    private Integer delFlag;
 }
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/committee/service/PayCommitteeInfoService.java b/jero-boot-incoming-payment/src/main/java/com/jero/committee/service/PayCommitteeInfoService.java
index ebeb465d..c318bd8d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/committee/service/PayCommitteeInfoService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/committee/service/PayCommitteeInfoService.java
@@ -3,6 +3,7 @@ import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.google.common.collect.Lists;
 
 import com.alibaba.fastjson.JSONArray;
@@ -10,6 +11,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.jero.committee.dto.CommitteeInfoDTO;
 import com.jero.committee.dto.CommitteeMemberInfoDTO;
 import com.jero.committee.entity.PayCommitteeMemberInfo;
+import com.jero.common.constant.CommonConstant;
 import com.jero.util.ZxdUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -59,6 +61,13 @@ public class PayCommitteeInfoService extends ServiceImpl<PayCommitteeInfoMapper,
     }
 
     public void sync(){
+        // 先把所有数据逻辑删除
+        LambdaUpdateWrapper<PayCommitteeMemberInfo> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.set(PayCommitteeMemberInfo::getDelFlag, CommonConstant.DEL_FLAG_1);
+        committeeMemberInfoService.update(wrapper);
+        LambdaUpdateWrapper<PayCommitteeInfo> wrapper1 = new LambdaUpdateWrapper<>();
+        wrapper1.set(PayCommitteeInfo::getDelFlag, CommonConstant.DEL_FLAG_1);
+        this.update(wrapper1);
         JSONObject jsonObject = ZxdUtil.getWyh();
         JSONObject result = jsonObject.getJSONObject("result");
         List<CommitteeMemberInfoDTO> committeeMemberInfoList = JSONArray.parseArray(result.getString("commiteeMemberInfoList"), CommitteeMemberInfoDTO.class);
@@ -133,6 +142,8 @@ public class PayCommitteeInfoService extends ServiceImpl<PayCommitteeInfoMapper,
         payCommitteeInfo.setFacsimile(dto.getFacsimile());
         payCommitteeInfo.setPreparationUnit(dto.getPreparationUnit());
         payCommitteeInfo.setCommitteeName(dto.getCommitteeName());
+        payCommitteeInfo.setDelFlag(CommonConstant.DEL_FLAG_0);
+
         return payCommitteeInfo;
 
     }
@@ -205,9 +216,11 @@ public class PayCommitteeInfoService extends ServiceImpl<PayCommitteeInfoMapper,
             DateTime date = DateUtil.date(Long.parseLong(birthDate));
             payCommitteeMemberInfo.setBirthDate(date.toDateStr());
         }
-        payCommitteeMemberInfo.setIsAcademician(dto.getIsAcademician());
+        String isAcademician = dto.getIsAcademician();
+        payCommitteeMemberInfo.setIsAcademician("1".equals(isAcademician)?"是":"否");
         payCommitteeMemberInfo.setIsAcademyOfSciences(dto.getIsAcademyOfSciences());
         payCommitteeMemberInfo.setOtherLanguagesAndProficiencyLevels(dto.getOtherLanguagesAndProficiencyLevels());
+        payCommitteeMemberInfo.setDelFlag(CommonConstant.DEL_FLAG_0);
         return payCommitteeMemberInfo;
 
     }