人员报销数据查看详情功能修改

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAccountant/mapper/xml/AccountantReimbursementBusinessMapper.xml

@@ -33,7 +33,8 @@
         a.reimbursement_day as "reimbursementDay",
         a.reimbursement_type AS "reimbursementType",
         a.reimbursement_fsalary AS "reimbursementFsalary",
-        a.reimbursement_amount as "reimbursementAmount"
+        a.reimbursement_amount as "reimbursementAmount",
+        a.office_type as "officeType"
     </sql>
 
     <sql id="reimbursementUserJoinColumns">
@@ -263,6 +264,9 @@
             <if test="endDate != null">
                 and a.create_date &lt;= #{endDate}
             </if>
+            <if test="officeType != null and officeType != ''">
+                and a.office_type = #{officeType}
+            </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/reimbursementAccountant/service/impl/AccountantReimbursementUserServiceImpl.java

@@ -188,16 +188,15 @@ public class AccountantReimbursementUserServiceImpl implements AccountantReimbur
         reimbursementBusiness.setBeginReimbursementQuota(reimbursementBusinessReturn.getBeginReimbursementQuota());
         reimbursementBusiness.setEndReimbursementQuota(reimbursementBusinessReturn.getEndReimbursementQuota());
         reimbursementBusiness.setReimbursementFsalary(reimbursementBusinessReturn.getReimbursementFsalary());
+        reimbursementBusiness.setOfficeType(reimbursementBusinessReturn.getOfficeType());
 
         AccountantReimbursementBusinessReturnDTO reimbursementBusinessReturnDTO = new AccountantReimbursementBusinessReturnDTO();
         List<AccountantReimbursementBusinessDTO> showList = businessMapper.findListByUserIdAndYear(reimbursementBusiness);
 
-        //获取实发类型集合
-        List<ReimbursementAddressDTO> reimbursementFsalaryList = businessMapper.getReimbursementFsalaryByUserIdAndYear(reimbursementBusiness);
-        reimbursementBusinessReturnDTO.setReimbursementFsalaryList(reimbursementFsalaryList);
 
         for (AccountantReimbursementBusinessDTO info : showList) {
             info.setReimbursementFsalary(DictUtils.getDictLabel(info.getReimbursementFsalary(), "reimbursement_fsalary", null));
+            info.setOfficeType(DictUtils.getDictLabel(info.getOfficeType(), "reimbursement_office_type", null));
         }
         //获取人员年度报销详情
         AccountantReimbursementUserDTO reimbursementUserInfo = mapper.queryByUserIdAndYear(reimbursementUserDTO);

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAssess/mapper/xml/AssessReimbursementBusinessMapper.xml

@@ -33,7 +33,8 @@
         a.reimbursement_day as "reimbursementDay",
         a.reimbursement_type AS "reimbursementType",
         a.reimbursement_fsalary AS "reimbursementFsalary",
-        a.reimbursement_amount as "reimbursementAmount"
+        a.reimbursement_amount as "reimbursementAmount",
+        a.office_type as "officeType"
     </sql>
 
     <sql id="reimbursementUserJoinColumns">
@@ -262,6 +263,9 @@
             <if test="endDate != null">
                 and a.create_date &lt;= #{endDate}
             </if>
+            <if test="officeType != null and officeType != ''">
+                and a.office_type = #{officeType}
+            </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/reimbursementAssess/service/impl/AssessReimbursementUserServiceImpl.java

@@ -186,16 +186,15 @@ public class AssessReimbursementUserServiceImpl implements AssessReimbursementUs
         reimbursementBusiness.setBeginReimbursementQuota(reimbursementBusinessReturn.getBeginReimbursementQuota());
         reimbursementBusiness.setEndReimbursementQuota(reimbursementBusinessReturn.getEndReimbursementQuota());
         reimbursementBusiness.setReimbursementFsalary(reimbursementBusinessReturn.getReimbursementFsalary());
+        reimbursementBusiness.setOfficeType(reimbursementBusinessReturn.getOfficeType());
 
         AssessReimbursementBusinessReturnDTO reimbursementBusinessReturnDTO = new AssessReimbursementBusinessReturnDTO();
         List<AssessReimbursementBusinessDTO> showList = businessMapper.findListByUserIdAndYear(reimbursementBusiness);
 
-        //获取实发类型集合
-        List<ReimbursementAddressDTO> reimbursementFsalaryList = businessMapper.getReimbursementFsalaryByUserIdAndYear(reimbursementBusiness);
-        reimbursementBusinessReturnDTO.setReimbursementFsalaryList(reimbursementFsalaryList);
 
         for (AssessReimbursementBusinessDTO info : showList) {
             info.setReimbursementFsalary(DictUtils.getDictLabel(info.getReimbursementFsalary(), "reimbursement_fsalary", null));
+            info.setOfficeType(DictUtils.getDictLabel(info.getOfficeType(), "reimbursement_office_type", null));
         }
 
         //获取人员年度报销详情

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementProject/mapper/xml/ProjectReimbursementBusinessMapper.xml

@@ -33,7 +33,8 @@
         a.reimbursement_day as "reimbursementDay",
         a.reimbursement_type AS "reimbursementType",
         a.reimbursement_fsalary AS "reimbursementFsalary",
-        a.reimbursement_amount as "reimbursementAmount"
+        a.reimbursement_amount as "reimbursementAmount",
+        a.office_type as "officeType"
     </sql>
 
     <sql id="reimbursementUserJoinColumns">
@@ -262,6 +263,9 @@
             <if test="endDate != null">
                 and a.create_date &lt;= #{endDate}
             </if>
+            <if test="officeType != null and officeType != ''">
+                and a.office_type = #{officeType}
+            </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/reimbursementProject/service/impl/ProjectReimbursementUserServiceImpl.java

@@ -185,16 +185,15 @@ public class ProjectReimbursementUserServiceImpl implements ProjectReimbursement
         reimbursementBusiness.setBeginReimbursementQuota(reimbursementBusinessReturn.getBeginReimbursementQuota());
         reimbursementBusiness.setEndReimbursementQuota(reimbursementBusinessReturn.getEndReimbursementQuota());
         reimbursementBusiness.setReimbursementFsalary(reimbursementBusinessReturn.getReimbursementFsalary());
+        reimbursementBusiness.setOfficeType(reimbursementBusinessReturn.getOfficeType());
 
         ProjectReimbursementBusinessReturnDTO reimbursementBusinessReturnDTO = new ProjectReimbursementBusinessReturnDTO();
         List<ProjectReimbursementBusinessDTO> showList = businessMapper.findListByUserIdAndYear(reimbursementBusiness);
 
-        //获取实发类型集合
-        List<ReimbursementAddressDTO> reimbursementFsalaryList = businessMapper.getReimbursementFsalaryByUserIdAndYear(reimbursementBusiness);
-        reimbursementBusinessReturnDTO.setReimbursementFsalaryList(reimbursementFsalaryList);
 
         for (ProjectReimbursementBusinessDTO info : showList) {
             info.setReimbursementFsalary(DictUtils.getDictLabel(info.getReimbursementFsalary(), "reimbursement_fsalary", null));
+            info.setOfficeType(DictUtils.getDictLabel(info.getOfficeType(), "reimbursement_office_type", null));
         }
 
         //获取人员年度报销详情

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

@@ -34,7 +34,8 @@
         a.reimbursement_type AS "reimbursementType",
         a.reimbursement_fsalary AS "reimbursementFsalary",
         a.reimbursement_address AS "reimbursementAddress",
-        a.reimbursement_amount as "reimbursementAmount"
+        a.reimbursement_amount as "reimbursementAmount",
+        a.office_type as "officeType"
     </sql>
 
     <sql id="reimbursementUserJoinColumns">

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

@@ -226,6 +226,7 @@ public class ReimbursementUserServiceImpl implements ReimbursementUserService {
 
         for (ReimbursementBusinessDTO info : showList) {
             info.setReimbursementFsalary(DictUtils.getDictLabel(info.getReimbursementFsalary(), "reimbursement_fsalary", null));
+            info.setOfficeType(DictUtils.getDictLabel(info.getOfficeType(), "reimbursement_office_type", null));
         }
         //获取人员年度报销详情
         ReimbursementUserDTO reimbursementUserInfo = mapper.queryByUserIdAndYear(reimbursementUserDTO);