Merge branch 'hot' into develop

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

@@ -120,7 +120,9 @@ public class SocialSecurityConfirmController extends BaseController {
             if (detail != null) {
                 List<BizSocialSecurityConfirmDetailEmployee> employees = socialSecurityConfirmDetailEmployeeService.query()
                         .eq("social_security_confirm_detail_id", detail.getId())
-                        .ne("change_status",2).list();
+                        .ne("change_status",2)
+                        .list();
+
                 employees.forEach(l -> l.setId(null));
                 condition.setDetails(employees);
             } else {

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

@@ -108,13 +108,13 @@
         WHERE c.id = #{company_id}
     </select>
     <select id="getList2" parameterType="BizFinancialSalary" resultMap="BizFinancialSalaryResult2">
-        SELECT t1.*, t2.name as company_name,t2.tax_type,t2.social_credit_code ,t3.account_name as from_company_name,
+        SELECT t1.*, t2.name as company_name,t2.tax_type, t3.account_name as from_company_name,
         t2.customer_label_id, t4.lable as customerLabelName,
         (select concat(bwor.year, '年', bwor.month, '月') from biz_work_order_record bwor where bwor.work_order_id =
         t1.work_order_id order by year desc, month desc limit 1) currentDate,
         t5.verifier_id,
         t6.nick_name as verifierName,
-        t5.verifier_time
+        t5.verifier_time,t8.account_name as toTenantName
         FROM biz_financial_salary t1
         left join biz_company t2 on t2.id = t1.company_id
         left join biz_tenant t3 on t3.id = t1.tenant_id
@@ -122,8 +122,10 @@
         left join biz_financial_salary_detail t5 on t5.financial_salary_id = t1.id
         and t5.deleted = 0 and t5.month = #{month} and t5.year = #{year} and t5.financial_salary_id = t1.id
         left join sys_user t6 on t6.user_id = t5.verifier_id
+        left join biz_entrust t7 on t7.work_order_id = t1.work_order_id and t7.deleted = 0 and  date_format(t7.current_month, '%Y%m') = concat(#{year}, #{month})
+        left join biz_tenant t8 on t8.id = t7.to_tenant_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
-            t1.deleted = 0
+            t1.deleted = 0 and t1.is_stop = 0
 
             <if test="isStop != null ">AND is_stop = #{isStop}</if>
             <if test="companyName != null ">AND t2.name like concat('%', #{companyName}, '%')</if>