Merge remote-tracking branch 'origin/master'

collect-fees/collect-fees-service/src/main/java/com/tofly/fees/userprofilemgt/controller/DaGhLogController.java

@@ -41,37 +41,38 @@ import java.util.Map;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/api/userprofilemgt/daghlog")
-@Api(tags="客户档案-用户过户日志接口")
+@Api(tags = "客户档案-用户过户日志接口")
 public class DaGhLogController {
 
-    private final  DaGhLogService daGhLogService;
+    private final DaGhLogService daGhLogService;
     private final DaCustomerService daCustomerService;
 
     private final SfRecMapper sfRecMapper;
 
-    private  final  DaGhLogMapper daGhLogMapper;
+    private final DaGhLogMapper daGhLogMapper;
+
     /**
-    * 分页查询daGhLog 用户过户日志
-    */
-    @GetMapping("/page" )
+     * 分页查询daGhLog 用户过户日志
+     */
+    @GetMapping("/page")
     @ApiOperation(value = "分页查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "current", value = "当前页码", required = true, dataType = "int"),
             @ApiImplicitParam(name = "size", value = "每页显示数据条数", required = true, dataType = "int"),
             @ApiImplicitParam(name = "pages", value = "共几页,输出参数", dataType = "int"),
             @ApiImplicitParam(name = "maxLimit", value = "每页最大显示数据", dataType = "int"),
-            @ApiImplicitParam(name = "orders[0].asc", value = "排序,bool类型",  dataType = "String"),
-            @ApiImplicitParam(name = "orders[0].column", value = "排序,字段名",  dataType = "String"),
-            @ApiImplicitParam(name = "searchText", value = "模糊查询(用户编号、用户姓名、用户地址、联系电话)",  dataType = "String"),
-            @ApiImplicitParam(name = "companyBranch", value = "公司",  dataType = "String"),
+            @ApiImplicitParam(name = "orders[0].asc", value = "排序,bool类型", dataType = "String"),
+            @ApiImplicitParam(name = "orders[0].column", value = "排序,字段名", dataType = "String"),
+            @ApiImplicitParam(name = "searchText", value = "模糊查询(用户编号、用户姓名、用户地址、联系电话)", dataType = "String"),
+            @ApiImplicitParam(name = "companyBranch", value = "公司", dataType = "String"),
             @ApiImplicitParam(name = "mrArea", value = "片区", dataType = "String"),
             @ApiImplicitParam(name = "mrBook", value = "抄表本", dataType = "String"),
             @ApiImplicitParam(name = "operatorDate_Start", value = "开始时间", dataType = "String"),
-            @ApiImplicitParam(name = "operatorDate_End", value = "结束时间",  dataType = "String")
+            @ApiImplicitParam(name = "operatorDate_End", value = "结束时间", dataType = "String")
     })
-    public ResultRespone getDaGhLogPage(Page page,String  companyBranch, String mrArea, String mrBook, String operatorDate_Start, String operatorDate_End, String searchText) {
-        IPage<DaGhLog> daGhLogIPage=daGhLogMapper.selectDaCustomerGhPage(page,companyBranch,mrArea,mrBook, operatorDate_Start,operatorDate_End,searchText);
-      return ResultRespone.success(daGhLogIPage);
+    public ResultRespone getDaGhLogPage(Page page, String companyBranch, String mrArea, String mrBook, String operatorDate_Start, String operatorDate_End, String searchText) {
+        IPage<DaGhLog> daGhLogIPage = daGhLogMapper.selectDaCustomerGhPage(page, companyBranch, mrArea, mrBook, operatorDate_Start, operatorDate_End, searchText);
+        return ResultRespone.success(daGhLogIPage);
     }
 
     @GetMapping("/export")
@@ -79,138 +80,144 @@ public class DaGhLogController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "current", value = "当前页码", required = true, dataType = "int"),
             @ApiImplicitParam(name = "size", value = "每页显示数据条数", required = true, dataType = "int"),
-            @ApiImplicitParam(name = "pages", value = "共几页,输出参数",  dataType = "int"),
-            @ApiImplicitParam(name = "maxLimit", value = "每页最大显示数据",  dataType = "int"),
-            @ApiImplicitParam(name = "orders[0].asc", value = "排序,bool类型",  dataType = "String"),
-            @ApiImplicitParam(name = "orders[0].column", value = "排序,字段名",  dataType = "String"),
-            @ApiImplicitParam(name = "searchText", value = "模糊查询(用户编号、用户姓名、用户地址、联系电话)",  dataType = "String"),
+            @ApiImplicitParam(name = "pages", value = "共几页,输出参数", dataType = "int"),
+            @ApiImplicitParam(name = "maxLimit", value = "每页最大显示数据", dataType = "int"),
+            @ApiImplicitParam(name = "orders[0].asc", value = "排序,bool类型", dataType = "String"),
+            @ApiImplicitParam(name = "orders[0].column", value = "排序,字段名", dataType = "String"),
+            @ApiImplicitParam(name = "searchText", value = "模糊查询(用户编号、用户姓名、用户地址、联系电话)", dataType = "String"),
             @ApiImplicitParam(name = "companyBranch", value = "公司", dataType = "String"),
-            @ApiImplicitParam(name = "mrArea", value = "片区",  dataType = "String"),
-            @ApiImplicitParam(name = "mrBook", value = "抄表本",  dataType = "String"),
+            @ApiImplicitParam(name = "mrArea", value = "片区", dataType = "String"),
+            @ApiImplicitParam(name = "mrBook", value = "抄表本", dataType = "String"),
             @ApiImplicitParam(name = "operatorDate_Start", value = "开始时间", dataType = "String"),
-            @ApiImplicitParam(name = "operatorDate_End", value = "结束时间",  dataType = "String")
+            @ApiImplicitParam(name = "operatorDate_End", value = "结束时间", dataType = "String")
     })
-    public void export(HttpServletResponse response,String  companyBranch, String mrArea, String mrBook, String operatorDate_Start, String operatorDate_End, String searchText) throws IOException {
-        List<DaGhLog> yhdaList = daGhLogMapper.selectDaCustomerGhPage(companyBranch,mrArea,mrBook, operatorDate_Start,operatorDate_End,searchText);
+    public void export(HttpServletResponse response, String companyBranch, String mrArea, String mrBook, String operatorDate_Start, String operatorDate_End, String searchText) throws IOException {
+        List<DaGhLog> yhdaList = daGhLogMapper.selectDaCustomerGhPage(companyBranch, mrArea, mrBook, operatorDate_Start, operatorDate_End, searchText);
         // 遍历查询结果进行赋值
         ExcleFileUtil.exportExcel(response, yhdaList, DaGhLog.class, "用户过户记录.xlsx");
     }
 
 
-
     /**
      * 通过id查询用户过户日志
+     *
      * @param id id
      * @return ResultRespone
      */
-    @GetMapping("/{id}" )
+    @GetMapping("/{id}")
     @ApiOperation(value = "通过ID查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "String")
     })
-    public ResultRespone getById(@PathVariable("id" ) String id) {
+    public ResultRespone getById(@PathVariable("id") String id) {
 
-      return ResultRespone.success(daGhLogService.getById(id));
+        return ResultRespone.success(daGhLogService.getById(id));
     }
 
     /**
      * 新增用户过户日志
+     *
      * @param daGhLog 用户过户日志
      * @return ResultRespone
      */
-    @ToFlyAppLog(title="新增用户过户日志" )
+    @ToFlyAppLog(title = "新增用户过户日志")
     @ApiOperation(value = "新增用户过户日志")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "yzqf", value = "是否验证欠费（1：需验证；0：不验证）", required = false, dataType = "String")
+    })
     @PostMapping
     @Transactional(rollbackFor = Exception.class) //声明式事务管理
-    public ResultRespone save(@RequestBody DaGhLog daGhLog) {
+    public ResultRespone save(@RequestBody DaGhLog daGhLog, @RequestParam(required = false) String yzqf) {
         ResultRespone<Object> rest = new ResultRespone<>();
-        if(StringUtil.isNotBlank(daGhLog.getCustomerNo()))
-        {
-            //判断用户是否存在欠费
-            Map<String,Object> map= sfRecMapper.SelectricCount(daGhLog.getCustomerNo());
-            int count=Integer.parseInt(map.get("COUNT").toString());
-            if(count>0)
-            {
-                rest.setCode(-1);
-                rest.setMessage("操作失败,用户存在欠费:"+count+"笔");
+        if (StringUtil.isNotBlank(daGhLog.getCustomerNo())) {
+            if (yzqf.equals("1")) {
+                //判断用户是否存在欠费
+                Map<String, Object> map = sfRecMapper.SelectricCount(daGhLog.getCustomerNo());
+                int count = Integer.parseInt(map.get("COUNT").toString());
+                if (count > 0) {
+                    rest.setCode(-1);
+                    rest.setMessage("操作失败,用户存在欠费:" + count + "笔");
+                    return rest;
+                }
             }
-            else {
-
-                daGhLog.setId(GuidGenerator.getGuid());//id
-                daGhLog.setOperatorDate(new Date());//操作时间
-                if(daGhLogService.save(daGhLog))
-                {
-                    DaCustomer daCustomer=new DaCustomer();
-                    daCustomer.setCustomerNo(daGhLog.getCustomerNo());//用户编号
-                    daCustomer.setCustomerName(daGhLog.getNewCustomerName());//姓名
+
+            daGhLog.setId(GuidGenerator.getGuid());//id
+            daGhLog.setOperatorDate(new Date());//操作时间
+            if (daGhLogService.save(daGhLog)) {
+                DaCustomer daCustomer = new DaCustomer();
+                daCustomer.setCustomerNo(daGhLog.getCustomerNo());//用户编号
+                daCustomer.setCustomerName(daGhLog.getNewCustomerName());//姓名
+                daCustomer.setCustomerPhone(daGhLog.getOldPhone());//电话
+                if (StringUtil.isNotBlank(daGhLog.getNewCustomerAddr())) {
                     daCustomer.setCustomerAddress(daGhLog.getNewCustomerAddr());//地址
-                    daCustomer.setCustomerPhone(daGhLog.getOldPhone());//电话
+                }
+                if (StringUtil.isNotBlank(daGhLog.getNewCertType())) {
                     daCustomer.setCertType(daGhLog.getNewCertType());//证件类型
+                }
+                if (StringUtil.isNotBlank(daGhLog.getNewCertNo())) {
                     daCustomer.setCertNo(daGhLog.getNewCertNo());//证件号码
-                    if(daCustomerService.updateById(daCustomer))
-                    {
-                        rest.setCode(1);
-                        rest.setMessage("操作成功");
-                    }
-                    else
-                    {
-                        rest.setCode(-1);
-                        rest.setMessage("操作失败");
-                    }
                 }
-                else
-                {
+
+                if (daCustomerService.updateById(daCustomer)) {
+                    rest.setCode(1);
+                    rest.setMessage("操作成功");
+                } else {
                     rest.setCode(-1);
                     rest.setMessage("操作失败");
                 }
+            } else {
+                rest.setCode(-1);
+                rest.setMessage("操作失败");
             }
 
-        }else
-        {
+        } else {
             rest.setCode(-1);
             rest.setMessage("操作失败,用户编号不能为空");
         }
-      return rest;
+        return rest;
     }
 
     /**
      * 修改用户过户日志
+     *
      * @param daGhLog 用户过户日志
      * @return ResultRespone
      */
-    @ToFlyAppLog(title="修改用户过户日志" )
+    @ToFlyAppLog(title = "修改用户过户日志")
     @ApiOperation(value = "修改用户过户日志")
     @PutMapping
     public ResultRespone updateById(@RequestBody DaGhLog daGhLog) {
-      return ResultRespone.success(daGhLogService.updateById(daGhLog));
+        return ResultRespone.success(daGhLogService.updateById(daGhLog));
     }
 
     /**
      * 通过id删除用户过户日志
+     *
      * @param id id
      * @return ResultRespone
      */
-    @ToFlyAppLog(title="通过id删除用户过户日志" )
+    @ToFlyAppLog(title = "通过id删除用户过户日志")
     @ApiOperation(value = "通过ID删除用户过户日志")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "String")
     })
-    @DeleteMapping("/{id}" )
+    @DeleteMapping("/{id}")
     public ResultRespone removeById(@PathVariable String id) {
-      return ResultRespone.success(daGhLogService.removeById(id));
+        return ResultRespone.success(daGhLogService.removeById(id));
     }
 
     /**
      * 通过id批量删除用户过户日志
+     *
      * @param ids id
      * @return ResultRespone
      */
-    @ToFlyAppLog(title="通过id批量删除用户过户日志" )
+    @ToFlyAppLog(title = "通过id批量删除用户过户日志")
     @ApiOperation(value = "通过ID批量删除用户过户日志")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "ids", value = "批量删除，多个id以逗号隔开", required = true, dataType = "String")
     })
-    @DeleteMapping("/deleteByIds" )
+    @DeleteMapping("/deleteByIds")
     public ResultRespone removeByIds(String ids) {
         return ResultRespone.success(daGhLogService.removeByIds(Arrays.asList(ids.split(","))));
     }

collect-fees/collect-fees-service/src/main/java/com/tofly/fees/userprofilemgt/entity/DaCustomerSelect.java

@@ -33,7 +33,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(value="TF_YWYS_DA_CUSTOMER",resultMap = "daCustomerMap")
+@TableName(value = "TF_YWYS_DA_CUSTOMER", resultMap = "daCustomerMap")
 @KeySequence("TF_YWYS_DA_CUSTOMER")
 @ApiModel
 @ContentRowHeight(20)
@@ -41,13 +41,24 @@ import java.util.Date;
 @ColumnWidth(30)
 public class DaCustomerSelect extends Model<DaCustomerSelect> {
 
+    @ColumnWidth(50)
+    @ExcelProperty("所属公司")
+    private String companyBranch;
     @ColumnWidth(20)
     @ExcelProperty("所属片区")
+    @ExcelIgnore
     private String mrArea;
     @ColumnWidth(20)
     @ExcelProperty("所属抄表册")
+    @ExcelIgnore
     private String mrBook;
     @ColumnWidth(20)
+    @ExcelProperty("所属片区名称")
+    private String mrAreaName;
+    @ColumnWidth(20)
+    @ExcelProperty("所属抄表册名称")
+    private String mrBookName;
+    @ColumnWidth(20)
     @ExcelProperty("用户编号")
     private String customerNo;
     @ColumnWidth(20)
@@ -82,9 +93,9 @@ public class DaCustomerSelect extends Model<DaCustomerSelect> {
     //@ExcelProperty("上次读数")
     @ExcelIgnore
     private String lastReading;
-   //@ColumnWidth(20)
-   // @ExcelProperty("本次读数")
-   @ExcelIgnore
+    //@ColumnWidth(20)
+    // @ExcelProperty("本次读数")
+    @ExcelIgnore
     private String thisReading;
 
     /**
@@ -106,6 +117,7 @@ public class DaCustomerSelect extends Model<DaCustomerSelect> {
 
     @ColumnWidth(1)
     @ExcelProperty("证件类别")
+    @ExcelIgnore
     private String certType;
     @ColumnWidth(50)
     @ExcelProperty("证件号码")

collect-fees/collect-fees-service/src/main/resources/mapper/userprofilemgt/DaCustomerMapper.xml

@@ -29,20 +29,14 @@
     <!--   //用户编号、用户姓名、用户地址、联系电话
       //片区、抄表本、水表型号、用水性质、用户状态、是否垃圾费、建档日期、抄表人员 -->
     <select id="selectDaCustomerPage" resultType="com.tofly.fees.userprofilemgt.entity.DaCustomerSelect">
-        select  distinct a.customer_no customerNo,a.customer_no_old customerNoOld,  c.name mrArea ,d.name mrBook, a.customer_name
+        select  distinct a.customer_no customerNo,a.customer_no_old customerNoOld ,a.COMPANY_BRANCH companyBranch,a.MR_AREA mrArea,a.MR_BOOK mrBook,  c.name mrAreaName ,d.name mrBookName, a.customer_name
         customerName,a.customer_address customerAddress,a.customer_phone customerPhone,a.apply_datetime
         applyDatetime,a.created_datetime createdDatetime,a.created_oname createdOname,nvl(a.meternumber,0) meterNumber
-        ,a.customer_state customerState, e.last_reading lastReading,e.this_reading thisReading,b.METER_CARD_ID meterCardId
-        ,f.name priceName,g.name meterTypeName
-        from tf_ywys_da_customer
         ,a.customer_state customerState,a.CERT_TYPE certType,a.CERT_NO certNo, e.last_reading lastReading,e.this_reading thisReading,b.METER_CARD_ID meterCardId  from tf_ywys_da_customer
         a inner join tf_ywys_da_meter b on a.CUSTOMER_NO=b.CUSTOMER_NO
         left join tf_ywys_bm_mr_area c on a.mr_area=c.code left join tf_ywys_bm_mr_book d on a.mr_book=d.code
-        left join tf_ywys_bw_meter_read_plan e on a.customer_no=e.customer_no
-        left join tf_ywys_bm_price f on b.price_code=f.code
-        left join tf_ywys_bm_meter_type g on b.meter_type=g.code
+        left join tf_ywys_bw_meter_read_plan e on a.customer_no=e.customer_no where 1=1
 
-        where 1=1
         <!--模糊查询 -->
         <if test="searchText != null and searchText != ''">
             and ( a.CUSTOMER_NO like '%${searchText}%' or a.CUSTOMER_NAME like '%${searchText}%' or a.CUSTOMER_ADDRESS like