筛选条件变更

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/mapper/xml/ReimbursementBusinessMapper.xml

@@ -244,7 +244,7 @@
     <select id="findListByUserIdAndYear" resultType="com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementBusinessDTO">
         SELECT
         <include refid="reimbursementBusinessColumns"/>
-        ,zri.business_code as "businessCode"
+        ,ifnull(zri.business_code,(select business_code from zs_wuhan_reimbursement_info where id = a.business_code_id)) as "businessCode"
         FROM zs_reimbursement_business_info a
         <include refid="reimbursementUserJoinColumns"/>
         left join zs_reimbursement_info zri on zri.id = a.business_code_id
@@ -252,7 +252,6 @@
             a.del_flag = 0
             and a.user_id = #{userId}
             and a.year = #{year}
-            and a.reimbursement_address = 0
         </where>
         order by a.update_date desc,a.year desc, a.user_id asc
     </select>
@@ -268,7 +267,9 @@
             a.del_flag = 0
             and a.user_id = #{userId}
             and a.year = #{year}
-            and a.reimbursement_address = 0
+            <if test="reimbursementAddress != null">
+                and a.reimbursement_address = #{reimbursementAddress}
+            </if>
         </where>
         order by a.update_date desc,a.year desc, a.user_id asc
     </select>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/mapper/xml/WuHanReimbursementBusinessMapper.xml

@@ -32,7 +32,7 @@
         a.year AS "year",
         a.reimbursement_day as "reimbursementDay",
         a.reimbursement_type AS "reimbursementType",
-        a.reimbursement_amount as "reimbursementAmount"
+        a.reimbursement_amount as "reimbursementAmount",
         a.reimbursement_address as "reimbursementAddress"
     </sql>
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/service/impl/ReimbursementUserServiceImpl.java

@@ -239,6 +239,7 @@ public class ReimbursementUserServiceImpl implements ReimbursementUserService {
         reimbursementBusiness.setUserId(reimbursementUserDTO.getUserId());
         reimbursementBusiness.setYear(reimbursementUserDTO.getYear());
         ReimbursementBusinessReturnDTO reimbursementBusinessReturnDTO = new ReimbursementBusinessReturnDTO();
+        reimbursementBusiness.setReimbursementAddress(1);
         List<ReimbursementBusinessDTO> list = businessMapper.findWuHanListByUserIdAndYear(reimbursementBusiness);
 
         //获取武汉人员年度报销详情