Merge branch 'feature/dangjian'

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/ReportPartyController.java

@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.party.controller;
 
 import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -29,6 +30,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.party.excel.ReportPartyExcel;
 import com.elink.esua.epdc.party.service.ReportPartyService;
 import com.elink.esua.epdc.user.dto.party.ReportPartyDTO;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -75,6 +77,12 @@ public class ReportPartyController {
     public Result update(@RequestBody ReportPartyDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        if (StringUtils.isNotEmpty(dto.getIdCard()) && StringUtils.isNotEmpty(dto.getName())) {
+            int sum = reportPartyService.findByIdCardAndName(dto.getIdCard(),dto.getName());
+            if(sum == 1){
+                throw new RenException("您已经报到，请等待审核！");
+            }
+        }
         reportPartyService.update(dto);
         return new Result();
     }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/dao/ReportPartyDao.java

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.party.dao;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.party.entity.ReportPartyEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 党员报道
@@ -30,4 +31,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ReportPartyDao extends BaseDao<ReportPartyEntity> {
 
+    int findByIdCardAndName(@Param("idCard") String idCard, @Param("name") String name);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/ReportPartyService.java

@@ -92,4 +92,6 @@ public interface ReportPartyService extends BaseService<ReportPartyEntity> {
      * @date 2023-06-30
      */
     void delete(String[] ids);
+
+    int findByIdCardAndName(String idCard, String name);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java

@@ -170,6 +170,11 @@ public class ReportPartyServiceImpl extends BaseServiceImpl<ReportPartyDao, Repo
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public int findByIdCardAndName(String idCard, String name) {
+       return baseDao.findByIdCardAndName(idCard, name);
+    }
+
     private void setDeptId(ReportPartyDTO dto) {
         UserDetail user = SecurityUser.getUser();
         String deptId = String.valueOf(user.getDeptId());

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/ReportPartyDao.xml

@@ -30,5 +30,16 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <select id="findByIdCardAndName" resultType="java.lang.Integer">
+        SELECT count(1) FROM report_party rp
+        WHERE rp.DEL_FLAG = 0
+        <if test="null != idCard and idCard != ''">
+            AND rp.ID_CARD = #{idCard}
+        </if>
+        <if test="null != name and name != ''">
+            AND rp.NAME = #{name}
+        </if>
+        LIMIT 1
+    </select>
 
 </mapper>