ly hai 1 ano
pai
achega
b5610e07a8

+ 2 - 1
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());

+ 1 - 0
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);
 }
 
 

+ 1 - 0
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);
 }

+ 5 - 0
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);
+    }
+
 }

+ 8 - 1
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