Merge branch 'develop'

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

@@ -175,7 +175,7 @@ public class BizHousingFundConfirmController extends BaseController {
             Map<String, Object> detailConditions = new HashMap<>();
             detailConditions.put("year", conditions.getYear());
             detailConditions.put("mainIds", list.stream().map(BizHousingFundConfirm::getId).collect(Collectors.toList()));
-            List<BizHousingFundConfirmDetail> details = housingFundConfirmDetailService.getList(detailConditions);
+            List<BizHousingFundConfirmDetail> details = housingFundConfirmDetailService.getList2(detailConditions);
             list.forEach(l -> {
                 l.setDetails(details.stream().filter(v -> v.getHousingFundConfirmId().equals(l.getId())).collect(Collectors.toList()));
             });

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

@@ -116,7 +116,8 @@ public class BizHousingFundDeclareController extends BaseController {
             detailConditions.setYear(conditions.getYear());
             detailConditions.setMonth(conditions.getMonth());
             detailConditions.setMainIds(list.stream().map(BizHousingFundDeclare::getId).collect(Collectors.toList()));
-            List<BizHousingFundDeclareDetail> details = housingFundDeclareDetailService.getListByBean(detailConditions);
+//            List<BizHousingFundDeclareDetail> details = housingFundDeclareDetailService.getListByBean(detailConditions);
+            List<BizHousingFundDeclareDetail> details = housingFundDeclareDetailService.getListByBean2(detailConditions);
             list.forEach(l -> {
                 List<BizHousingFundDeclareDetail> lDetail = details.stream().filter(v -> v.getHousingFundDeclareId().equals(l.getId())).collect(Collectors.toList());
                 l.setDetail(lDetail.isEmpty() ? null : lDetail.get(0));
@@ -289,14 +290,31 @@ public class BizHousingFundDeclareController extends BaseController {
     public AjaxResult getMembers(@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()).list();
+            List<BizHousingFundConfirmDetailEmployee> employees = housingFundConfirmDetailEmployeeService.query()
+                    .eq("housing_fund_confirm_detail_id", housingFundConfirmDetail.getId())
+                    .list();
             return success(employees);
         } else {
             return success(new ArrayList<>());
         }
 
     }
+    @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/housingFund/mapper/BizHousingFundConfirmDetailMapper.java

@@ -38,6 +38,7 @@ public interface BizHousingFundConfirmDetailMapper extends BaseMapper<BizHousing
     int getTotal(Map<String, Object> conditions);
 
 
+    List<BizHousingFundConfirmDetail> getList2(Map<String, Object> conditions);
 }
 
 

src/main/java/cn/ezhizao/project/business/housingFund/mapper/BizHousingFundDeclareDetailMapper.java

@@ -38,6 +38,7 @@ public interface BizHousingFundDeclareDetailMapper extends BaseMapper<BizHousing
     int getTotal(Map<String, Object> conditions);
 
 
+    List<BizHousingFundDeclareDetail> getList2(BizHousingFundDeclareDetail financialHousingFundDeclareDetail);
 }
 
 

src/main/java/cn/ezhizao/project/business/housingFund/service/IBizHousingFundConfirmDetailService.java

@@ -36,4 +36,5 @@ public interface IBizHousingFundConfirmDetailService extends IService<BizHousing
      */
     int getTotal(Map<String, Object> conditions);
 
+    List<BizHousingFundConfirmDetail> getList2(Map<String, Object> detailConditions);
 }

src/main/java/cn/ezhizao/project/business/housingFund/service/IBizHousingFundDeclareDetailService.java

@@ -36,4 +36,5 @@ public interface IBizHousingFundDeclareDetailService extends IService<BizHousing
      */
     int getTotal(Map<String, Object> conditions);
 
+    List<BizHousingFundDeclareDetail> getListByBean2(BizHousingFundDeclareDetail detailConditions);
 }

src/main/java/cn/ezhizao/project/business/housingFund/service/impl/BizHousingFundConfirmDetailServiceImpl.java

@@ -40,7 +40,12 @@ public class BizHousingFundConfirmDetailServiceImpl extends ServiceImpl<BizHousi
     public int getTotal(Map<String,Object> conditions) {
         return financialHousingFundConfirmDetailDao.getTotal(conditions);
     }
-    
+
+    @Override
+    public List<BizHousingFundConfirmDetail> getList2(Map<String, Object> conditions) {
+        return financialHousingFundConfirmDetailDao.getList2(conditions);
+    }
+
     @Override
     @Transactional
     public boolean save(BizHousingFundConfirmDetail entity) {

src/main/java/cn/ezhizao/project/business/housingFund/service/impl/BizHousingFundDeclareDetailServiceImpl.java

@@ -35,4 +35,9 @@ public class BizHousingFundDeclareDetailServiceImpl extends ServiceImpl<BizHousi
         return financialHousingFundDeclareDetailDao.getTotal(conditions);
     }
 
+    @Override
+    public List<BizHousingFundDeclareDetail> getListByBean2(BizHousingFundDeclareDetail financialHousingFundDeclareDetail) {
+        return financialHousingFundDeclareDetailDao.getList2(financialHousingFundDeclareDetail);
+    }
+
 }

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

@@ -107,14 +107,16 @@ 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()) {
             // 获取上个月的工资人员信息
             // 先获取之前的一个月是否已填报，然后获取填报后的工资人员信息
             BizSocialSecurityConfirmDetail detail = socialSecurityConfirmDetailService.query().eq("social_security_confirm_id", condition.getSocialSecurityConfirmId()).lt("concat(year,month)", condition.getYear() + condition.getMonth()).orderByDesc("concat(year, month)").last("limit 1").one();
             if (detail != null) {
-                List<BizSocialSecurityConfirmDetailEmployee> employees = socialSecurityConfirmDetailEmployeeService.query().eq("social_security_confirm_detail_id", detail.getId()).ne("change_status", 2).list();
+                List<BizSocialSecurityConfirmDetailEmployee> employees = socialSecurityConfirmDetailEmployeeService.query().eq("social_security_confirm_detail_id", detail.getId()).list();
                 employees.forEach(l -> l.setId(null));
                 condition.setDetails(employees);
             } else {

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

@@ -112,7 +112,8 @@ public class SocialSecurityDeclareController extends BaseController {
             detailConditions.setYear(conditions.getYear());
             detailConditions.setMonth(conditions.getMonth());
             detailConditions.setMainIds(list.stream().map(BizSocialSecurityDeclare::getId).collect(Collectors.toList()));
-            List<BizSocialSecurityDeclareDetail> details = socialSecurityDeclareDetailService.getListByBean(detailConditions);
+//            List<BizSocialSecurityDeclareDetail> details = socialSecurityDeclareDetailService.getListByBean(detailConditions);
+            List<BizSocialSecurityDeclareDetail> details = socialSecurityDeclareDetailService.getListByBean2(detailConditions);
 
             list.forEach(l -> {
                 List<BizSocialSecurityDeclareDetail> lDetail = details.stream().filter(v -> v.getSocialSecurityDeclareId().equals(l.getId())).collect(Collectors.toList());
@@ -321,13 +322,30 @@ public class SocialSecurityDeclareController extends BaseController {
     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();
+            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()
+                    .eq("social_security_confirm_detail_id", financialSocialSecurityConfirmDetail.getId())
+                    .ne("change_status", 2)
+                    .list();
             return success(employees);
         } else {
             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/mapper/BizSocialSecurityDeclareDetailMapper.java

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

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/IBizSocialSecurityDeclareDetailService.java

@@ -36,4 +36,5 @@ public interface IBizSocialSecurityDeclareDetailService extends IService<BizSoci
      */
     int getTotal(Map<String, Object> conditions);
 
+    List<BizSocialSecurityDeclareDetail> getListByBean2(BizSocialSecurityDeclareDetail financialSocialSecurityDeclareDetail);
 }

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/java/cn/ezhizao/project/business/socialSecurity/service/impl/BizSocialSecurityDeclareDetailServiceImpl.java

@@ -35,4 +35,9 @@ public class BizSocialSecurityDeclareDetailServiceImpl extends ServiceImpl<BizSo
         return financialSocialSecurityDeclareDetailDao.getTotal(conditions);
     }
 
+    @Override
+    public List<BizSocialSecurityDeclareDetail> getListByBean2(BizSocialSecurityDeclareDetail financialSocialSecurityDeclareDetail) {
+        return financialSocialSecurityDeclareDetailDao.getList2(financialSocialSecurityDeclareDetail);
+    }
+
 }

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

@@ -6,7 +6,9 @@
         <id column="id" jdbcType="BIGINT" property="id"/>
         <collection property="details" select="getEmployees" column="id" />
     </resultMap>
-
+    <resultMap id="BaseResultMap2" type="cn.ezhizao.project.business.housingFund.domain.BizHousingFundConfirmDetail">
+        <id column="id" jdbcType="BIGINT" property="id"/>
+    </resultMap>
     <resultMap id="EmployeeResult" type="cn.ezhizao.project.business.housingFund.domain.BizHousingFundConfirmDetailEmployee">
         <id column="id" jdbcType="INTEGER" property="id"/>
     </resultMap>
@@ -20,7 +22,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

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

@@ -9,6 +9,11 @@
                     column="id"/>
     </resultMap>
 
+    <resultMap id="BaseResultMap2" type="cn.ezhizao.project.business.housingFund.domain.BizHousingFundDeclareDetail">
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="id" jdbcType="BIGINT" property="id"/>
+    </resultMap>
+
     <resultMap type="cn.ezhizao.project.system.domain.SysFileStorage" id="FileStorageResult">
         <id column="id" property="id"/>
     </resultMap>
@@ -26,7 +31,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

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

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

@@ -12,7 +12,12 @@
                     ofType="cn.ezhizao.project.system.domain.SysFileStorage"
                     select="getReportFiles" column="id"/>
     </resultMap>
+    <resultMap id="BaseResultMap2"
+               type="cn.ezhizao.project.business.socialSecurity.domain.BizSocialSecurityDeclareDetail">
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="id" jdbcType="BIGINT" property="id"/>
 
+    </resultMap>
     <resultMap type="cn.ezhizao.project.system.domain.SysFileStorage" id="FileStorageResult">
         <id column="id" property="id"/>
     </resultMap>
@@ -38,7 +43,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