Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/controller/ReimbursementBusinessController.java

@@ -127,6 +127,7 @@ public class ReimbursementBusinessController {
             return ResponseEntity.badRequest ().body ("请先选择业务信息");
         }
         ReimbursementBusinessDTO reimbursementBusiness = new ReimbursementBusinessDTO();
+        reimbursementBusiness.setReimbursementAddress(0);
         reimbursementBusiness.setBusinessCodeId(id);
         ReimbursementBusinessReturnDTO info = service.findListByBusinessCodeId(reimbursementBusiness);
         return ResponseEntity.ok(info);

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/controller/ReimbursementUserController.java

@@ -88,6 +88,7 @@ public class ReimbursementUserController {
     @GetMapping("findList")
     public ResponseEntity findList(ReimbursementUserDTO reimbursementUser, Page<ReimbursementUserDTO> page) {
         IPage<ReimbursementUserDTO> list = service.findList(page,reimbursementUser);
+        System.out.println("ReimbursementUserDTO:"+list.getRecords().get(0).getAddressName());
         return ResponseEntity.ok(list);
     }
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/controller/WuHanReimbursementBusinessController.java

@@ -6,11 +6,7 @@ import com.google.common.collect.Lists;
 import com.jeeplus.aop.demo.annotation.DemoMode;
 import com.jeeplus.aop.logging.annotation.ApiLog;
 import com.jeeplus.sys.utils.StringUtils;
-import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementBusinessDTO;
-import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementBusinessReturnDTO;
-import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementDTO;
-import com.jeeplus.test.reimbursementsys.domain.dto.ReimbursementUserDTO;
-import com.jeeplus.test.reimbursementsys.service.ReimbursementBusinessService;
+import com.jeeplus.test.reimbursementsys.domain.dto.*;
 import com.jeeplus.test.reimbursementsys.service.WuHanReimbursementBusinessService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -54,7 +50,7 @@ public class WuHanReimbursementBusinessController {
     @PreAuthorize("hasAnyAuthority('wuHanReimbursementBusiness:add')")
     @GetMapping("getBusinessById")
     public ResponseEntity getBusinessById(@RequestParam String id) {
-        ReimbursementDTO reimbursementDTO = service.getBusinessById (id);
+        WuHanReimbursementDTO reimbursementDTO = service.getWuHanBusinessById (id);
         return ResponseEntity.ok (reimbursementDTO);
     }
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/domain/dto/ReimbursementBusinessDTO.java

@@ -30,6 +30,6 @@ public class ReimbursementBusinessDTO extends BaseEntity {
     private String reimbursementAmount;  //报销额度
     private String remainReimbursementAmount;  //剩余报销额度
     private String remarks; //备注
-    private int reimbursementAddress;  //地区类型（1：正常报销；2：武汉）
+    private int reimbursementAddress;  //地区类型（0：正常报销；1：武汉）
 
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/domain/dto/ReimbursementUserDTO.java

@@ -20,6 +20,8 @@ import javax.validation.constraints.NotNull;
 @TableName("zs_reimbursement_user_info")
 public class ReimbursementUserDTO extends BaseEntity {
 
+    private int addressName; //地区类型（0：正常报销；1：武汉）
+
     @Excel(name = "姓名")
     @Length(min = 1, max = 100)
     @NotNull(message = "姓名不能为空")
@@ -60,5 +62,4 @@ public class ReimbursementUserDTO extends BaseEntity {
     private String surplusReimbursementAmount;  //剩余报销额度
     private String keyFlag; //用于判断使用
 
-
 }

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

@@ -235,7 +235,7 @@
         <where>
             a.del_flag = 0
             and a.business_code_id = #{businessCodeId}
-            and a.reimbursement_address = 0
+            and a.reimbursement_address = #{reimbursementAddress}
         </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/ReimbursementUserMapper.xml

@@ -62,6 +62,8 @@
         SELECT
             <include refid="reimbursementUserColumns"/>
             ,
+        zrbi.reimbursement_address as "addressName"
+            ,
         ifnull(sum(zrbi.reimbursement_day),0) as "alreadyReimbursementDay",
         ifnull(sum(zrbi.reimbursement_amount),0) as "alreadyReimbursementAmount",
         ifnull((a.reimbursement_quota - ifnull(sum(zrbi.reimbursement_amount),0)),0) as "remainReimbursementAmount",

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

@@ -82,7 +82,7 @@
             and a.user_id = #{userId}
             and a.year in (${year})
             and a.reimbursement_type = 1
-            and a.reimbursement_address = 1
+--             and a.reimbursement_address = 1
         </where>
         group by a.year
         order by a.year desc
@@ -201,7 +201,7 @@
         and a.user_id= #{userId}
         and a.year = #{year}
         and a.reimbursement_type = 1
-        and a.reimbursement_address = 1
+        and a.reimbursement_address = #{reimbursementAddress}
     </select>
 
     <select id="getAlreadyReimbursementQuotaByBusinessCodeId" resultType="java.lang.String">
@@ -209,7 +209,7 @@
         from zs_reimbursement_business_info a
         where a.del_flag = 0
         and a.business_code_id= #{businessCodeId}
-        and a.reimbursement_address = 1
+        and a.reimbursement_address = #{reimbursementAddress}
     </select>
 
     <select id="getGatheringStatusById" resultType="java.lang.String">
@@ -234,7 +234,7 @@
         <where>
             a.del_flag = 0
             and a.business_code_id = #{businessCodeId}
-            and a.reimbursement_address = 1
+            and a.reimbursement_address = #{reimbursementAddress}
         </where>
         order by a.update_date desc,a.year desc, a.user_id asc
     </select>
@@ -251,7 +251,7 @@
             a.del_flag = 0
             and a.user_id = #{userId}
             and a.year = #{year}
-            and a.reimbursement_address = 1
+            and a.reimbursement_address = #{reimbursementAddress}
         </where>
         order by a.update_date desc,a.year desc, a.user_id asc
     </select>
@@ -267,7 +267,7 @@
             a.del_flag = 0
             and a.user_id = #{userId}
             and a.year = #{year}
-            and a.reimbursement_address = 1
+            and a.reimbursement_address = #{reimbursementAddress}
         </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/service/impl/ReimbursementBusinessServiceImpl.java

@@ -52,6 +52,7 @@ public class ReimbursementBusinessServiceImpl implements ReimbursementBusinessSe
         reimbursement.setBusinessCodeId(id);
         ReimbursementBusinessDTO reimbursementBusiness = new ReimbursementBusinessDTO();
         reimbursementBusiness.setBusinessCodeId(id);
+        reimbursementBusiness.setReimbursementAddress(0);
         //根据业务id查询已收款的发票信息收款总额
         String getReceiptInvoiceByReimbursementId = reimbursementSysMapper.getReceiptInvoiceIncomeByReimbursementId(id);
         BigDecimal income = new BigDecimal(getReceiptInvoiceByReimbursementId);    //发票收入
@@ -78,6 +79,7 @@ public class ReimbursementBusinessServiceImpl implements ReimbursementBusinessSe
         reimbursement.setBusinessCodeId(id);
         ReimbursementBusinessDTO reimbursementBusiness = new ReimbursementBusinessDTO();
         reimbursementBusiness.setBusinessCodeId(id);
+        reimbursementBusiness.setReimbursementAddress(0);
         //根据业务id查询已收款的发票信息收款总额
         String getReceiptInvoiceByReimbursementId = wuHanReimbursementSysMapper.getReceiptInvoiceIncomeByReimbursementId(id);
         BigDecimal income = new BigDecimal(getReceiptInvoiceByReimbursementId);    //发票收入
@@ -197,6 +199,7 @@ public class ReimbursementBusinessServiceImpl implements ReimbursementBusinessSe
             return map;
         }
         //查询该人员该年度已报销额度(正常报销额度)
+        reimbursementUser.setReimbursementAddress(0);
         String alreadyReimbursementQuota = mapper.getAlreadyReimbursementQuotaByUserIdAndYear(reimbursementUser);
         //判断本地报销额度是否超过该年度所剩余报销额度，如果超过，则不允许报销，并抛出。否则进行报销并保存报销数据
         BigDecimal alreadyReimbursementQuotaB = new BigDecimal(alreadyReimbursementQuota);    //已报销额度
@@ -318,6 +321,7 @@ public class ReimbursementBusinessServiceImpl implements ReimbursementBusinessSe
             return map;
         }
         //查询该人员该年度已报销额度(正常报销额度)
+        reimbursementUser.setReimbursementAddress(0);
         String alreadyReimbursementQuota = mapper.getAlreadyReimbursementQuotaByUserIdAndYear(reimbursementUser);
         //判断本地报销额度是否超过该年度所剩余报销额度，如果超过，则不允许报销，并抛出。否则进行报销并保存报销数据
         BigDecimal alreadyReimbursementQuotaB = new BigDecimal(alreadyReimbursementQuota);    //已报销额度
@@ -416,6 +420,7 @@ public class ReimbursementBusinessServiceImpl implements ReimbursementBusinessSe
 
     @Override
     public ReimbursementBusinessReturnDTO findListByBusinessCodeId(ReimbursementBusinessDTO reimbursementBusiness) {
+        reimbursementBusiness.setReimbursementAddress(0);
         List<ReimbursementBusinessDTO> list = mapper.findListByBusinessCodeId(reimbursementBusiness);
         for (ReimbursementBusinessDTO info : list) {
             info.setReimbursementType(DictUtils.getDictLabel(info.getReimbursementType(), "reimbursement_type", null));

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

@@ -62,6 +62,7 @@ public class WuHanReimbursementBusinessServiceImpl implements WuHanReimbursement
         BigDecimal reimbursementRatio = new BigDecimal(getReimbursementRatioByReimbursementId);    //报销比例
         BigDecimal canReimbursementAmount = income.multiply(reimbursementRatio).divide(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP);    //该项目可报销额度计算
         //查询该业务总报销额度
+        reimbursementBusiness.setReimbursementAddress(1);
         String alreadyReimbursementQuotaByBusinessCodeId = mapper.getAlreadyReimbursementQuotaByBusinessCodeId(reimbursementBusiness);
         BigDecimal allAlreadyReimbursementQuota = new BigDecimal(alreadyReimbursementQuotaByBusinessCodeId);    //总报销额度
         reimbursement.setAllAlreadyReimbursementQuota(allAlreadyReimbursementQuota.toString());
@@ -88,6 +89,7 @@ public class WuHanReimbursementBusinessServiceImpl implements WuHanReimbursement
         BigDecimal reimbursementRatio = new BigDecimal(getReimbursementRatioByReimbursementId);    //报销比例
         BigDecimal canReimbursementAmount = income.multiply(reimbursementRatio).divide(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP);    //该项目可报销额度计算
         //查询该业务总报销额度
+        reimbursementBusiness.setReimbursementAddress(1);
         String alreadyReimbursementQuotaByBusinessCodeId = mapper.getAlreadyReimbursementQuotaByBusinessCodeId(reimbursementBusiness);
         BigDecimal allAlreadyReimbursementQuota = new BigDecimal(alreadyReimbursementQuotaByBusinessCodeId);    //总报销额度
         reimbursement.setAllAlreadyReimbursementQuota(allAlreadyReimbursementQuota.toString());
@@ -194,6 +196,7 @@ public class WuHanReimbursementBusinessServiceImpl implements WuHanReimbursement
             map.put("message", "该员工" + reimbursementUser.getYear() + "年度未添加报销信息，无法进行报销");
             return map;
         }
+        reimbursementUser.setReimbursementAddress(1);
         //查询该人员该年度已报销额度(正常报销额度)
         String alreadyReimbursementQuota = mapper.getAlreadyReimbursementQuotaByUserIdAndYear(reimbursementUser);
         //判断本地报销额度是否超过该年度所剩余报销额度，如果超过，则不允许报销，并抛出。否则进行报销并保存报销数据
@@ -233,6 +236,7 @@ public class WuHanReimbursementBusinessServiceImpl implements WuHanReimbursement
         BigDecimal reimbursementRatio = new BigDecimal(getReimbursementRatioByReimbursementId);    //报销比例
         BigDecimal canReimbursementAmount = income.multiply(reimbursementRatio).divide(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP);    //该项目可报销额度计算
         //查询该业务总报销额度
+        reimbursementUser.setReimbursementAddress(1);
         String alreadyReimbursementQuotaByBusinessCodeId = mapper.getAlreadyReimbursementQuotaByBusinessCodeId(reimbursementUser);
         String gatheringStatus = mapper.getGatheringStatusById(reimbursementUser);
         BigDecimal allAlreadyReimbursementQuota = new BigDecimal(alreadyReimbursementQuotaByBusinessCodeId);    //总报销额度
@@ -315,6 +319,7 @@ public class WuHanReimbursementBusinessServiceImpl implements WuHanReimbursement
             map.put("message", "该员工" + reimbursementUser.getYear() + "年度未添加报销信息，无法进行报销");
             return map;
         }
+        reimbursementUser.setReimbursementAddress(1);
         //查询该人员该年度已报销额度(正常报销额度)
         String alreadyReimbursementQuota = mapper.getAlreadyReimbursementQuotaByUserIdAndYear(reimbursementUser);
         //判断本地报销额度是否超过该年度所剩余报销额度，如果超过，则不允许报销，并抛出。否则进行报销并保存报销数据
@@ -354,6 +359,7 @@ public class WuHanReimbursementBusinessServiceImpl implements WuHanReimbursement
         BigDecimal reimbursementRatio = new BigDecimal(getReimbursementRatioByReimbursementId);    //报销比例
         BigDecimal canReimbursementAmount = income.multiply(reimbursementRatio).divide(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP);    //该项目可报销额度计算
         //查询该业务总报销额度
+        reimbursementUser.setReimbursementAddress(1);
         String alreadyReimbursementQuotaByBusinessCodeId = mapper.getAlreadyReimbursementQuotaByBusinessCodeId(reimbursementUser);
         String gatheringStatus = mapper.getWuHanGatheringStatusById(reimbursementUser);
         BigDecimal allAlreadyReimbursementQuota = new BigDecimal(alreadyReimbursementQuotaByBusinessCodeId);    //总报销额度
@@ -414,6 +420,7 @@ public class WuHanReimbursementBusinessServiceImpl implements WuHanReimbursement
 
     @Override
     public ReimbursementBusinessReturnDTO findListByBusinessCodeId(ReimbursementBusinessDTO reimbursementBusiness) {
+        reimbursementBusiness.setReimbursementAddress(1);
         List<ReimbursementBusinessDTO> list = mapper.findListByBusinessCodeId(reimbursementBusiness);
         for (ReimbursementBusinessDTO info : list) {
             info.setReimbursementType(DictUtils.getDictLabel(info.getReimbursementType(), "reimbursement_type", null));