导出历史

tnc-sms/src/main/java/org/jeecg/modules/smscheck/annotation/controller/SmsCheckCustomerDataController.java

@@ -195,6 +195,7 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
         SmsCheckCustomerDataLogBill smsCheckCustomerDataLogBill = new SmsCheckCustomerDataLogBill();
         BeanUtils.copyProperties(smsCheckCustomerDataLog,smsCheckCustomerDataLogBill);
         smsCheckCustomerDataLogBill.setId(null);
+        smsCheckCustomerDataLogBill.setCreateDate(new Date());
         iSmsCheckCustomerDataLogBillService.save(smsCheckCustomerDataLogBill);
 
         boolean saveData = customerDataService.saveOrUpdate(smsCheckCustomerData);

tnc-sms/src/main/java/org/jeecg/modules/smscheck/annotation/controller/SmsCheckCustomerInfoController.java

@@ -75,7 +75,8 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     private ISmsCheckTaskService taskService;
     @Autowired
     private ISysBaseAPI sysBaseAPI;
-
+    @Autowired
+    private SmsCheckZGHistoryService smsCheckZGHistoryService;
     /**
      * 分页列表查询
      *
@@ -332,15 +333,117 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
                 BeanUtil.copyProperties(smsCheckCustomerData,smsCheckCustomerDataAndLog);
                 //以dataid代替id
                 smsCheckCustomerDataAndLog.setDataId(smsCheckCustomerInfo.getId());
+                if (smsCheckCustomerData!=null){
+                    zgHis(smsCheckCustomerDataAndLog,smsCheckCustomerData);
+                }
+
                 pageList.add(smsCheckCustomerDataAndLog);
 
 
         }
+//        // 判断是否整改过
+//        for (SmsCheckCustomerDataAndLog smsCheckCustomerDataAndLog : pageList) {
+//            LambdaQueryWrapper<SmsCheckCustomerDataLogBill> querySaWrapper = new LambdaQueryWrapper<SmsCheckCustomerDataLogBill>();
+//            //全部人员
+//            querySaWrapper.eq(SmsCheckCustomerDataLogBill::getInfoId,smsCheckCustomerDataAndLog.getInfoId()).orderByDesc(SmsCheckCustomerDataLogBill::getCreateDate);
+//            List<SmsCheckCustomerDataLogBill> list = iSmsCheckCustomerDataLogBillService.list(querySaWrapper);
+//            for (SmsCheckCustomerDataLogBill smsCheckCustomerDataLogBill : list) {
+//                //不相等 说明整改
+//                if (!smsCheckCustomerDataAndLog.getInfoResult().equals(smsCheckCustomerDataLogBill.getInfoResult())){
+//                    smsCheckCustomerDataAndLog.setInfoResultIs("是");
+//                }
+//                if (!smsCheckCustomerDataAndLog.getContractDateResult().equals(smsCheckCustomerDataLogBill.getContractDateResult())){
+//                    smsCheckCustomerDataAndLog.setContractDateResultIs("是");
+//                }
+//                if (!smsCheckCustomerDataAndLog.getBusinessLicenseDateResult().equals(smsCheckCustomerDataLogBill.getBusinessLicenseDateResult())){
+//                    smsCheckCustomerDataAndLog.setBusinessLicenseDateResultIs("是");
+//                }
+//                if (!smsCheckCustomerDataAndLog.getCodeNumberDateResult().equals(smsCheckCustomerDataLogBill.getCodeNumberDateResult())){
+//                    smsCheckCustomerDataAndLog.setCodeNumberDateResultIs("是");
+//                }
+//                if (!smsCheckCustomerDataAndLog.getFilingsDateResult().equals(smsCheckCustomerDataLogBill.getFilingsDateResult())){
+//                    smsCheckCustomerDataAndLog.setFilingsDateResultIs("是");
+//                }
+//                if (!smsCheckCustomerDataAndLog.getPermitDateResult().equals(smsCheckCustomerDataLogBill.getPermitDateResult())){
+//                    smsCheckCustomerDataAndLog.setPermitDateResultIs("是");
+//                }
+//                if (!smsCheckCustomerDataAndLog.getCorporationCardResult().equals(smsCheckCustomerDataLogBill.getCorporationCardResult())){
+//                    smsCheckCustomerDataAndLog.setCorporationCardResultIs("是");
+//                }
+//                if (!smsCheckCustomerDataAndLog.getPersonResponsibleResult().equals(smsCheckCustomerDataLogBill.getPersonResponsibleResult())){
+//                    smsCheckCustomerDataAndLog.setPersonResponsibleResultIs("是");
+//                }
+//                if (!smsCheckCustomerDataAndLog.getOperatorCardResult().equals(smsCheckCustomerDataLogBill.getOperatorCardResult())){
+//                    smsCheckCustomerDataAndLog.setOperatorCardResultIs("是");
+//                }
+//                if (!smsCheckCustomerDataAndLog.getOperatorCardPhoneResult().equals(smsCheckCustomerDataLogBill.getOperatorCardPhoneResult())){
+//                    smsCheckCustomerDataAndLog.setOperatorCardPhoneResultIs("是");
+//                }
+//                if (!smsCheckCustomerDataAndLog.getDevicePhoneResult().equals(smsCheckCustomerDataLogBill.getDevicePhoneResult())){
+//                    smsCheckCustomerDataAndLog.setDevicePhoneResultIs("是");
+//                }
+//                if (!smsCheckCustomerDataAndLog.getTextMessageResult().equals(smsCheckCustomerDataLogBill.getTextMessageResult())){
+//                    smsCheckCustomerDataAndLog.setTextMessageResultIs("是");
+//                }
+//                if (!smsCheckCustomerDataAndLog.getTextMessageBookResult().equals(smsCheckCustomerDataLogBill.getTextMessageBookResult())){
+//                    smsCheckCustomerDataAndLog.setTextMessageBookResultIs("是");
+//                }
+//                if (!smsCheckCustomerDataAndLog.getSecureBookResult().equals(smsCheckCustomerDataLogBill.getSecureBookResult())){
+//                    smsCheckCustomerDataAndLog.setSecureBookResultIs("是");
+//                }
+//                if (!smsCheckCustomerDataAndLog.getSpecialResult().equals(smsCheckCustomerDataLogBill.getSpecialResult())){
+//                    smsCheckCustomerDataAndLog.setSpecialResultIs("是");
+//                }
+//                if (!smsCheckCustomerDataAndLog.getNetworkAccessResult().equals(smsCheckCustomerDataLogBill.getNetworkAccessResult())){
+//                    smsCheckCustomerDataAndLog.setNetworkAccessResultIs("是");
+//                }
+//                if (!smsCheckCustomerDataAndLog.getGroupPriceApprovalResult().equals(smsCheckCustomerDataLogBill.getGroupPriceApprovalResult())){
+//                    smsCheckCustomerDataAndLog.setGroupPriceApprovalResultIs("是");
+//                }
+//            }
+//            LambdaQueryWrapper<SmsCheckZGHistory> lambdaQueryWrapper = new LambdaQueryWrapper<SmsCheckZGHistory>();
+//            //全部人员
+//            lambdaQueryWrapper.eq(SmsCheckZGHistory::getDataId,smsCheckCustomerDataAndLog.getDataId());
+//            List<SmsCheckZGHistory> list1 = smsCheckZGHistoryService.list(lambdaQueryWrapper);
+//            String context ="";
+//            for (SmsCheckZGHistory smsCheckZGHistory : list1) {
+//                context+="(修改时间："+smsCheckZGHistory.getUpdateDate()+"字段："+smsCheckZGHistory.getUpdateField()+smsCheckZGHistory.getContext()+");";
+//            }
+//            smsCheckCustomerDataAndLog.setZgShow(context);
+//        }
+
+        List<SmsCheckCustomerDataAndLog> exportList = null;
+
+        // 过滤选中数据
+        String selections = request.getParameter("selections");
+        if (oConvertUtils.isNotEmpty(selections)) {
+            List<String> selectionList = Arrays.asList(selections.split(","));
+            exportList = pageList.stream().filter(item -> selectionList.contains(getId(item))).collect(Collectors.toList());
+        } else {
+            exportList = pageList;
+        }
+        exportList = dataToResult(exportList);
+        // Step.3 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        //此处设置的filename无效 ,前端会重更新设置一下
+        mv.addObject(NormalExcelConstants.FILE_NAME, title);
+        mv.addObject(NormalExcelConstants.CLASS, clazz);
+        //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
+        ExportParams  exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
+        exportParams.setImageBasePath(upLoadPath);
+        //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
+        mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+        mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+        return mv;
+    }
+
+
+    private void zgHis(SmsCheckCustomerDataAndLog smsCheckCustomerDataAndLog,SmsCheckCustomerData smsCheckCustomerData){
         // 判断是否整改过
-        for (SmsCheckCustomerDataAndLog smsCheckCustomerDataAndLog : pageList) {
+
             LambdaQueryWrapper<SmsCheckCustomerDataLogBill> querySaWrapper = new LambdaQueryWrapper<SmsCheckCustomerDataLogBill>();
             //全部人员
-            querySaWrapper.eq(SmsCheckCustomerDataLogBill::getInfoId,smsCheckCustomerDataAndLog.getInfoId());
+            querySaWrapper.eq(SmsCheckCustomerDataLogBill::getInfoId,smsCheckCustomerDataAndLog.getInfoId()).orderByDesc(SmsCheckCustomerDataLogBill::getCreateDate);
             List<SmsCheckCustomerDataLogBill> list = iSmsCheckCustomerDataLogBillService.list(querySaWrapper);
             for (SmsCheckCustomerDataLogBill smsCheckCustomerDataLogBill : list) {
                 //不相等 说明整改
@@ -396,35 +499,17 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
                     smsCheckCustomerDataAndLog.setGroupPriceApprovalResultIs("是");
                 }
             }
-
-        }
-
-        List<SmsCheckCustomerDataAndLog> exportList = null;
-
-        // 过滤选中数据
-        String selections = request.getParameter("selections");
-        if (oConvertUtils.isNotEmpty(selections)) {
-            List<String> selectionList = Arrays.asList(selections.split(","));
-            exportList = pageList.stream().filter(item -> selectionList.contains(getId(item))).collect(Collectors.toList());
-        } else {
-            exportList = pageList;
-        }
-        exportList = dataToResult(exportList);
-        // Step.3 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        //此处设置的filename无效 ,前端会重更新设置一下
-        mv.addObject(NormalExcelConstants.FILE_NAME, title);
-        mv.addObject(NormalExcelConstants.CLASS, clazz);
-        //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
-        ExportParams  exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
-        exportParams.setImageBasePath(upLoadPath);
-        //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
-        mv.addObject(NormalExcelConstants.PARAMS,exportParams);
-        mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
-        return mv;
+            LambdaQueryWrapper<SmsCheckZGHistory> lambdaQueryWrapper = new LambdaQueryWrapper<SmsCheckZGHistory>();
+            //全部人员
+            lambdaQueryWrapper.eq(SmsCheckZGHistory::getDataId,smsCheckCustomerData.getId());
+            List<SmsCheckZGHistory> list1 = smsCheckZGHistoryService.list(lambdaQueryWrapper);
+            String context ="";
+            for (SmsCheckZGHistory smsCheckZGHistory : list1) {
+                context+="(修改时间："+smsCheckZGHistory.getUpdateDate()+" 字段："+smsCheckZGHistory.getUpdateField()+"  "+smsCheckZGHistory.getContext()+");   \n";
+            }
+            smsCheckCustomerDataAndLog.setZgShow(context);
     }
 
-
     private  List<SmsCheckCustomerDataAndLog> dataToResult(List<SmsCheckCustomerDataAndLog> exportList ){
 
         for (SmsCheckCustomerDataAndLog smsCheckCustomerDataAndLog : exportList) {

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsCheckCustomerDataAndLog.java

@@ -403,57 +403,59 @@ public class SmsCheckCustomerDataAndLog  {
     private String sysOrgCode;
 
 
-    @Excel(name = "基本信息稽核稽核结果是否整改过", width = 15)
-    @ApiModelProperty(value = "基本信息稽核稽核结果是否整改过")
+    @Excel(name = "基本信息稽核稽核内容是否整改过", width = 15)
+    @ApiModelProperty(value = "基本信息稽核稽核内容是否整改过")
     private String infoResultIs;
-    @Excel(name = "合同到期时间稽核结果是否整改过", width = 15)
-    @ApiModelProperty(value = "合同到期时间稽核结果是否整改过")
+    @Excel(name = "合同到期时间稽核内容是否整改过", width = 15)
+    @ApiModelProperty(value = "合同到期时间稽核内容是否整改过")
     private String  contractDateResultIs;
-    @Excel(name = "营业执照到期时间稽核结果是否整改过", width = 15)
-    @ApiModelProperty(value = "营业执照到期时间稽核结果是否整改过")
+    @Excel(name = "营业执照到期时间稽核内容是否整改过", width = 15)
+    @ApiModelProperty(value = "营业执照到期时间稽核内容是否整改过")
     private String businessLicenseDateResultIs;
-    @Excel(name = "码号证书到期时间稽核结果是否整改过", width = 15)
-    @ApiModelProperty(value = "码号证书到期时间稽核结果是否整改过")
+    @Excel(name = "码号证书到期时间稽核内容是否整改过", width = 15)
+    @ApiModelProperty(value = "码号证书到期时间稽核内容是否整改过")
     private String codeNumberDateResultIs;
-    @Excel(name = "备案通知到期时间稽核结果是否整改过", width = 15)
-    @ApiModelProperty(value = "备案通知到期时间稽核结果是否整改过")
+    @Excel(name = "备案通知到期时间稽核内容是否整改过", width = 15)
+    @ApiModelProperty(value = "备案通知到期时间稽核内容是否整改过")
     private String filingsDateResultIs;
-    @Excel(name = "增值业务许可证到期时间稽核结果是否整改过", width = 15)
-    @ApiModelProperty(value = "增值业务许可证到期时间稽核结果是否整改过")
+    @Excel(name = "增值业务许可证到期时间稽核内容是否整改过", width = 15)
+    @ApiModelProperty(value = "增值业务许可证到期时间稽核内容是否整改过")
     private String permitDateResultIs;
-    @Excel(name = "法人/责任人证件稽核结果是否整改过", width = 15)
-    @ApiModelProperty(value = "法人/责任人证件稽核结果是否整改过")
+    @Excel(name = "法人/责任人证件稽核内容是否整改过", width = 15)
+    @ApiModelProperty(value = "法人/责任人证件稽核内容是否整改过")
     private String corporationCardResultIs;
-    @Excel(name = "责任人授权书稽核结果是否整改过", width = 15)
-    @ApiModelProperty(value = "责任人授权书稽核结果是否整改过")
+    @Excel(name = "责任人授权书稽核内容是否整改过", width = 15)
+    @ApiModelProperty(value = "责任人授权书稽核内容是否整改过")
     private String personResponsibleResultIs;
-    @Excel(name = "经办人证件稽核结果是否整改过", width = 15)
-    @ApiModelProperty(value = "经办人证件稽核结果是否整改过")
+    @Excel(name = "经办人证件稽核内容是否整改过", width = 15)
+    @ApiModelProperty(value = "经办人证件稽核内容是否整改过")
     private String operatorCardResultIs;
-    @Excel(name = "经办人手持身份证照片稽核结果是否整改过", width = 15)
-    @ApiModelProperty(value = "经办人手持身份证照片稽核结果是否整改过")
+    @Excel(name = "经办人手持身份证照片稽核内容是否整改过", width = 15)
+    @ApiModelProperty(value = "经办人手持身份证照片稽核内容是否整改过")
     private String operatorCardPhoneResultIs;
-    @Excel(name = "机房设备照片稽核结果是否整改过", width = 15)
-    @ApiModelProperty(value = "机房设备照片稽核结果是否整改过")
+    @Excel(name = "机房设备照片稽核内容是否整改过", width = 15)
+    @ApiModelProperty(value = "机房设备照片稽核内容是否整改过")
     private String devicePhoneResultIs;
-    @Excel(name = "短信模板稽核结果是否整改过", width = 15)
-    @ApiModelProperty(value = "短信模板稽核结果是否整改过")
+    @Excel(name = "短信模板稽核内容是否整改过", width = 15)
+    @ApiModelProperty(value = "短信模板稽核内容是否整改过")
     private String textMessageResultIs;
-    @Excel(name = "端口类短信业务责任承诺书稽核结果是否整改过", width = 15)
-    @ApiModelProperty(value = "端口类短信业务责任承诺书稽核结果是否整改过")
+    @Excel(name = "端口类短信业务责任承诺书稽核内容是否整改过", width = 15)
+    @ApiModelProperty(value = "端口类短信业务责任承诺书稽核内容是否整改过")
     private String textMessageBookResultIs;
-    @Excel(name = "信息安全责任承诺书稽核结果是否整改过", width = 15)
-    @ApiModelProperty(value = "信息安全责任承诺书稽核结果是否整改过")
+    @Excel(name = "信息安全责任承诺书稽核内容是否整改过", width = 15)
+    @ApiModelProperty(value = "信息安全责任承诺书稽核内容是否整改过")
     private String secureBookResultIs;
-    @Excel(name = "特殊资费审批稽核结果是否整改过", width = 15)
-    @ApiModelProperty(value = "特殊资费审批稽核结果是否整改过")
+    @Excel(name = "特殊资费审批稽核内容是否整改过", width = 15)
+    @ApiModelProperty(value = "特殊资费审批稽核内容是否整改过")
     private String specialResultIs;
-    @Excel(name = "入网签报稽核结果是否整改过", width = 15)
-    @ApiModelProperty(value = "入网签报稽核结果是否整改过")
+    @Excel(name = "入网签报稽核内容是否整改过", width = 15)
+    @ApiModelProperty(value = "入网签报稽核内容是否整改过")
     private String networkAccessResultIs;
-    @Excel(name = "集团价格审批稽核结果是否整改过", width = 15)
-    @ApiModelProperty(value = "集团价格审批稽核结果是否整改过")
+    @Excel(name = "集团价格审批稽核内容是否整改过", width = 15)
+    @ApiModelProperty(value = "集团价格审批稽核内容是否整改过")
     private String groupPriceApprovalResultIs;
 
-
+    @Excel(name = "整改内容展示", width = 35)
+    @ApiModelProperty(value = "整改内容展示")
+    private String zgShow;
 }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsCheckCustomerDataLogBill.java

@@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
+import java.util.Date;
 import java.util.Objects;
 
 @Data
@@ -115,6 +116,6 @@ public class SmsCheckCustomerDataLogBill {
      @ApiModelProperty(value = "集团价格审批结果备注")
     private String groupPriceApprovalResultRemark;
 
-
+    private Date createDate;
 
 }