no message

src/main/java/cn/ezhizao/project/business/deduct/controller/BizDeductController.java

@@ -240,7 +240,7 @@ public class BizDeductController extends BaseController {
         BizSocialSecurityConfirmDetail socialSecurityConditions = new BizSocialSecurityConfirmDetail();
         socialSecurityConditions.setStartMonth(DateTime.of(conditions.getStartMonth()).toSqlDate());
         socialSecurityConditions.setEndMonth(DateTime.of(conditions.getEndMonth()).toSqlDate());
-        List<BizSocialSecurityConfirmDetail> socialSecurityConfirmDetails = bizSocialSecurityConfirmDetailService.getListByBean(socialSecurityConditions);
+        List<BizSocialSecurityConfirmDetail> socialSecurityConfirmDetails = bizSocialSecurityConfirmDetailService.getListByBean2(socialSecurityConditions);
         BizCompany companyCondition = new BizCompany();
         companyCondition.setIds(loopEntrust.stream().map(BizEntrust::getCompanyId).collect(Collectors.toList()));
         List<BizCompany> companies = null;

src/main/java/cn/ezhizao/project/business/deduct/domain/BizDeduct.java

@@ -103,9 +103,9 @@ public class BizDeduct extends BaseEntity
     @TableField(exist = false)
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date currentDate;
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date startMonth;
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date endMonth;
 
     @TableField(exist = false)

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

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

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> getListByBean2(BizSocialSecurityConfirmDetail financialSocialSecurityConfirmDetail) {
+            return financialSocialSecurityConfirmDetailDao.getList2(financialSocialSecurityConfirmDetail);
+    }
+
     @Override
     @Transactional
     public boolean save(BizSocialSecurityConfirmDetail entity) {

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

@@ -17,8 +17,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join biz_company t4 on t4.id = t1.company_id
         left join biz_task_type t3 on t3.id = t1.task_type_id
         left join biz_task_type_detail t5 on t5.id = t1.task_type_detail_id
+        LEFT JOIN biz_work_order t6 on t6.id = t1.work_order_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
-            t1.deleted = 0
+            t1.deleted = 0 and t6.deleted = 0
             <if test="id != null "> AND t1.id = #{id}</if>
             <if test="companyId != null "> AND t1.company_id = #{companyId}</if>
             <if test="fromTenantId != null "> AND t1.from_tenant_id = #{fromTenantId}</if>

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

@@ -7,7 +7,11 @@
         <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