no message

src/main/java/cn/ezhizao/project/business/housingFund/controller/BizHousingFundDeclareController.java

@@ -291,7 +291,6 @@ public class BizHousingFundDeclareController extends BaseController {
         if (housingFundConfirmDetail != null) {
             List<BizHousingFundConfirmDetailEmployee> employees = housingFundConfirmDetailEmployeeService.query()
                     .eq("housing_fund_confirm_detail_id", housingFundConfirmDetail.getId())
-                    .ne("change_status", 2)
                     .list();
             return success(employees);
         } else {
@@ -299,7 +298,22 @@ public class BizHousingFundDeclareController extends BaseController {
         }
 
     }
+    @ApiOperation("获取公积金人员信息")
+    @PostMapping("/getMembersNoDelete")
+    @ResponseBody
+    public AjaxResult getMembersNoDelete(@RequestBody BizHousingFundConfirmDetail detail) {
+        BizHousingFundConfirmDetail housingFundConfirmDetail = housingFundConfirmDetailService.query().eq("company_id", detail.getCompanyId()).eq("year", detail.getYear()).eq("month", detail.getMonth()).one();
+        if (housingFundConfirmDetail != null) {
+            List<BizHousingFundConfirmDetailEmployee> employees = housingFundConfirmDetailEmployeeService.query()
+                    .eq("housing_fund_confirm_detail_id", housingFundConfirmDetail.getId())
+                    .ne("change_status", 2)
+                    .list();
+            return success(employees);
+        } else {
+            return success(new ArrayList<>());
+        }
 
+    }
     private Boolean checkDeduction(BizHousingFundDeclareDetail detail) {
         BizHousingFundDeclare main = housingFundDeclareService.getById(detail.getHousingFundDeclareId());
         if (detail.getAmount() != null && detail.getAmount().compareTo(BigDecimal.ZERO) > 0 && detail.getStatus().equals(3)) {

src/main/java/cn/ezhizao/project/business/socialSecurity/controller/SocialSecurityConfirmController.java

@@ -107,7 +107,9 @@ public class SocialSecurityConfirmController extends BaseController {
     @PreAuthorize("@ss.hasAnyPermi('business:socialSecurityConfirm:query,business:socialSecurityConfirm:view')")
     @PostMapping("/getDetail")
     public AjaxResult getDetail(@RequestBody BizSocialSecurityConfirmDetail condition) {
-        List<BizSocialSecurityConfirmDetail> socialSecurityConfirmDetails = socialSecurityConfirmDetailService.getListByBean(condition);
+//        List<BizSocialSecurityConfirmDetail> socialSecurityConfirmDetails = socialSecurityConfirmDetailService.getListByBean(condition);
+        List<BizSocialSecurityConfirmDetail> socialSecurityConfirmDetails = socialSecurityConfirmDetailService.BaseResultMap2(condition);
+
         BizCompany company = companyService.getById(condition.getCompanyId());
         if (socialSecurityConfirmDetails.isEmpty()) {
             // 获取上个月的工资人员信息

src/main/java/cn/ezhizao/project/business/socialSecurity/controller/SocialSecurityDeclareController.java

@@ -319,6 +319,21 @@ public class SocialSecurityDeclareController extends BaseController {
     @PostMapping("/getMembers")
     @ResponseBody
     public AjaxResult getMembers(@RequestBody BizSocialSecurityConfirmDetail detail) {
+        BizSocialSecurityConfirmDetail financialSocialSecurityConfirmDetail = socialSecurityConfirmDetailService.query().eq("company_id", detail.getCompanyId()).eq("year", detail.getYear()).eq("month", detail.getMonth()).one();
+        if (financialSocialSecurityConfirmDetail != null) {
+            List<BizSocialSecurityConfirmDetailEmployee> employees = socialSecurityConfirmDetailEmployeeService.query()
+                    .eq("social_security_confirm_detail_id", financialSocialSecurityConfirmDetail.getId())
+                    .list();
+            return success(employees);
+        } else {
+            return success(new ArrayList<>());
+        }
+    }
+    @PreAuthorize("@ss.hasPermi('business:socialSecurityDeclare:query')")
+    @ApiOperation("获取社保人员信息")
+    @PostMapping("/getMembersNoDelete")
+    @ResponseBody
+    public AjaxResult getMembersNoDelete(@RequestBody BizSocialSecurityConfirmDetail detail) {
         BizSocialSecurityConfirmDetail financialSocialSecurityConfirmDetail = socialSecurityConfirmDetailService.query().eq("company_id", detail.getCompanyId()).eq("year", detail.getYear()).eq("month", detail.getMonth()).one();
         if (financialSocialSecurityConfirmDetail != null) {
             List<BizSocialSecurityConfirmDetailEmployee> employees = socialSecurityConfirmDetailEmployeeService.query()
@@ -330,7 +345,6 @@ public class SocialSecurityDeclareController extends BaseController {
             return success(new ArrayList<>());
         }
     }
-
     @PreAuthorize("@ss.hasPermi('business:socialSecurityDeclare:edit')")
     @ApiOperation("退回")
     @PostMapping("/turnBackDetail")

src/main/java/cn/ezhizao/project/business/socialSecurity/mapper/BizSocialSecurityConfirmDetailMapper.java

@@ -37,6 +37,7 @@ public interface BizSocialSecurityConfirmDetailMapper extends BaseMapper<BizSoci
      */
     int getTotal(Map<String, Object> conditions);
 
+    List<BizSocialSecurityConfirmDetail> getList2(BizSocialSecurityConfirmDetail financialSocialSecurityConfirmDetail);
 }
 
 

src/main/java/cn/ezhizao/project/business/socialSecurity/service/IBizSocialSecurityConfirmDetailService.java

@@ -37,4 +37,5 @@ public interface IBizSocialSecurityConfirmDetailService extends IService<BizSoci
      */
     int getTotal(Map<String, Object> conditions);
 
+    List<BizSocialSecurityConfirmDetail> BaseResultMap2(BizSocialSecurityConfirmDetail condition);
 }

src/main/java/cn/ezhizao/project/business/socialSecurity/service/impl/BizSocialSecurityConfirmDetailServiceImpl.java

@@ -41,6 +41,11 @@ public class BizSocialSecurityConfirmDetailServiceImpl extends ServiceImpl<BizSo
         return financialSocialSecurityConfirmDetailDao.getTotal(conditions);
     }
 
+    @Override
+    public List<BizSocialSecurityConfirmDetail> BaseResultMap2(BizSocialSecurityConfirmDetail financialSocialSecurityConfirmDetail) {
+        return financialSocialSecurityConfirmDetailDao.getList2(financialSocialSecurityConfirmDetail);
+    }
+
     @Override
     @Transactional
     public boolean save(BizSocialSecurityConfirmDetail entity) {

src/main/resources/mybatis/business/BizSocialSecurityConfirmDetailMapper.xml

@@ -5,9 +5,13 @@
     <resultMap id="BaseResultMap"
                type="cn.ezhizao.project.business.socialSecurity.domain.BizSocialSecurityConfirmDetail">
         <id column="id" jdbcType="BIGINT" property="id"/>
+<!--        <collection property="details" select="getEmployees" column="id" />-->
+    </resultMap>
+    <resultMap id="BaseResultMap2"
+               type="cn.ezhizao.project.business.socialSecurity.domain.BizSocialSecurityConfirmDetail">
+        <id column="id" jdbcType="BIGINT" property="id"/>
         <collection property="details" select="getEmployees" column="id" />
     </resultMap>
-
     <resultMap id="EmployeeResult" type="cn.ezhizao.project.business.socialSecurity.domain.BizSocialSecurityConfirmDetailEmployee">
         <id column="id" jdbcType="INTEGER" property="id"/>
     </resultMap>
@@ -21,7 +25,9 @@
     <select id="getList" resultMap="BaseResultMap">
         <include refid="getListSql"/>
     </select>
-
+    <select id="getList2" resultMap="BaseResultMap2">
+        <include refid="getListSql"/>
+    </select>
     <!--带条件的List查询 数据总条数-->
     <select id="getTotal" resultType="java.lang.Integer">
         SELECT COUNT(1) FROM (<include refid="getListSql"/>) AS C