Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/CrmCustomRemindServiceImpl.java

@@ -52,10 +52,10 @@ public class CrmCustomRemindServiceImpl extends AbstractCrudService<CrmCustomRem
         SendSmsRequest request = new SendSmsRequest();
         request.setPhoneNumbers(crmCustomRemind.getPhone());//接收短信的手机号码
         request.setSignName("上海永天科技股份有限公司");//短信签名名称
-        request.setTemplateCode("SMS_461735160");//短信模板CODE
+        request.setTemplateCode("SMS_461850226");//短信模板CODE
         Date date = DateUtils.parseDate(crmCustomRemind.getExpireDate());
         long days = (date.getTime() - new Date().getTime())/(24*60*60*1000);
-        request.setTemplateParam("{\"name\":\""+crmCustomRemind.getCompanyName()+"\","+"\"days\":\""+days+"\","+"\"custom\":\""+crmCustomRemind.getCustomId()+"\"}");//短信模板变量对应的实际值
+        request.setTemplateParam("{\"date\":\""+crmCustomRemind.getExpireDate()+"\","+"\"custom\":\""+crmCustomRemind.getCustomId()+"\"}");//短信模板变量对应的实际值
 
         try {
             SendSmsResponse response = client.getAcsResponse(request);

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/CrmInvoiceInfoServiceImpl.java

@@ -66,16 +66,8 @@ public class CrmInvoiceInfoServiceImpl extends AbstractCrudService<CrmInvoiceInf
                 exportVO.setProjectId(list1.get(i).getProjectId());
                 exportVO.setInvoiceTitle(list1.get(i).getInvoiceTitle());
                 exportVO.setDutyId(list1.get(i).getDutyId());
-                if(list1.get(i).getInvoiceAttribute() == 1){  //发票性质;1：电子发票，2：纸质发票
-                    exportVO.setInvoiceAttributeName("电子发票");
-                }else{
-                    exportVO.setInvoiceAttributeName("纸质发票");
-                }
-                if(list1.get(i).getInvoiceType() == 1){ //发票类型;1：普票，2：专票
-                    exportVO.setInvoiceTypeName("普票");
-                }else{
-                    exportVO.setInvoiceTypeName("专票");
-                }
+                exportVO.setInvoiceAttribute(list1.get(i).getInvoiceAttribute());  //发票性质;1：电子发票,2：纸质发票
+                exportVO.setInvoiceType(list1.get(i).getInvoiceType()); //发票类型;1：普票,2：专票
                 exportVO.setAmount(list1.get(i).getAmount().toString());
                 exportVO.setApplicant(list1.get(i).getApplicant());
                 exportVO.setPhone(list1.get(i).getPhone());

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDeviceInfoServiceImpl.java

@@ -68,17 +68,14 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
             dmpDeviceInfo.setTenantId(SecurityUtils.getTenantId());
             dmpDeviceInfo.setServiceStatus(1);
             this.save(dmpDeviceInfo);
-        }
-
-
-        DmpDeviceStatus dmpDeviceStatus = new DmpDeviceStatus();
-        dmpDeviceStatus.setDeviceId(dmpDeviceInfo.getDeviceId());
-        dmpDeviceStatus.setProductId(dmpDeviceInfo.getProductId());
-        dmpDeviceStatus.setDeviceStatus(2);
-        dmpDeviceStatus.setLastOfflineTime(LocalDateTime.now());
-        dmpDeviceStatusService.save(dmpDeviceStatus);
-
 
+            DmpDeviceStatus dmpDeviceStatus = new DmpDeviceStatus();
+            dmpDeviceStatus.setDeviceId(dmpDeviceInfo.getDeviceId());
+            dmpDeviceStatus.setProductId(dmpDeviceInfo.getProductId());
+            dmpDeviceStatus.setDeviceStatus(2);
+            dmpDeviceStatus.setLastOfflineTime(LocalDateTime.now());
+            dmpDeviceStatusService.save(dmpDeviceStatus);
+        }
     }
 
     @Override

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/CrmCustomInfoExportVO.java

@@ -80,9 +80,9 @@ public class CrmCustomInfoExportVO implements Serializable {
     private String salePerson;
 
     /**
-     * 状态;1：使用中，2：已到期
+     * 状态;1：使用中,2：已到期
      */
-    @Excel(name = "状态", readConverterExp = "1=使用中，2=已到期")
+    @Excel(name = "状态", readConverterExp = "1=使用中,2=已到期")
     private Integer maintainStatus;
 
     /**

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/CrmInvoiceInfoExportVO.java

@@ -34,16 +34,16 @@ public class CrmInvoiceInfoExportVO  implements Serializable {
     private String dutyId;
 
     /**
-     * 发票性质;1：电子发票，2：纸质发票
+     * 发票性质;1：电子发票,2：纸质发票
      */
-    @Excel(name = "发票性质", readConverterExp = "1=电子发票，2=纸质发票")
-    private String invoiceAttributeName;
+    @Excel(name = "发票性质", readConverterExp = "1=电子发票,2=纸质发票")
+    private Integer invoiceAttribute;
 
     /**
-     * 发票类型;1：普票，2：专票
+     * 发票类型;1：普票,2：专票
      */
-    @Excel(name = "发票类型", readConverterExp = "1=普票，2=专票")
-    private String invoiceTypeName;
+    @Excel(name = "发票类型", readConverterExp = "1=普票,2=专票")
+    private Integer invoiceType;
 
     /**
      * 金额