Merge remote-tracking branch 'origin/master'

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

@@ -722,6 +722,9 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
                     if (smcSpecialCheckLog.getHandNumberCardState() != null && !smcSpecialCheckLog.getHandNumberCardState().equals(smcSpecialCheckLogHistory.getHandNumberCardState())) {
                         specialExaminationExport.setHandNumberCardStateIs(1);
                     }
+                    if (smcSpecialCheckLog.getNotesState() != null && !smcSpecialCheckLog.getNotesState().equals(smcSpecialCheckLogHistory.getNotesState())) {
+                        specialExaminationExport.setNotesStateIs(1);
+                    }
                 }
             }
 

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

@@ -89,6 +89,9 @@ public class SmcSpecialCheckLog  implements Serializable {
     private Integer commitmentVideoState;
     /**  */
     private String commitmentVideoNote;
+    /**其它材料*/
+    private Integer notesState;
+    private String notesNote;
     /** 员工编号 */
     private String staffNo;
     /** 创建人 */

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

@@ -88,6 +88,10 @@ public class SmcSpecialCheckLogHistory implements Serializable {
     private Integer commitmentVideoState;
     /**  */
     private String commitmentVideoNote;
+    /**其它材料*/
+    private Integer notesState;
+    private String notesNote;
+
     /** 员工编号 */
     private String staffNo;
     /** 创建人 */

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

@@ -24,7 +24,7 @@ public class SmcSpecialCheckLogStateVo {
     private Integer handCertificateState;
     /** 号卡 */
     private Integer numberCardState;
-    /** 号卡 */
+    /** 手持号卡 */
     private Integer handNumberCardState;
     /** 防诈骗承诺函 */
     private Integer letterCommitmentState;
@@ -40,4 +40,6 @@ public class SmcSpecialCheckLogStateVo {
     private Integer consumptionVoucherState;
     /** 承诺视频 */
     private Integer commitmentVideoState;
+    /** 其它材料*/
+    private Integer notesState;
 }

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

@@ -9,7 +9,7 @@ import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
+    import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;

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

@@ -138,4 +138,9 @@ public class SpecialExamination implements Serializable {
     private String specialReviewForm;
     private String specialReviewFormRemark;
 
+    @MyCustomAnnotation
+    @ApiModelProperty(value = "其它资料")
+    private String notes;
+    private String notesRemark;
+
 }

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

@@ -137,7 +137,9 @@ public class SpecialExaminationExport {
     /** 消费凭证 */
     @Excel(name = "消费凭证稽核结果是否整改", width = 20 , dicCode = "special_check_state_is")
     private Integer consumptionVoucherStateIs;
-
+    /** 消费凭证 */
+    @Excel(name = "其它材料稽核结果是否整改", width = 20 , dicCode = "special_check_state_is")
+    private Integer notesStateIs;
     /** 稽核状态 0：未处理；1：未完善；2：待稽核；3：已整改；4：待整改；5：稽核通过； */
     @Excel(name = "稽核状态", width = 15, dicCode = "sms_check_check_state")
     @Dict(dicCode = "sms_check_check_state")

tnc-sms/src/main/java/org/jeecg/modules/smscheck/mapper/SmsCheckCustomerInfoMapper.java

@@ -208,14 +208,14 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
         }
         public String selectCompanyList(SmsCheckCustomerInfo smsCheckCustomerInfo) {
             StringBuilder sql = new StringBuilder();
-            sql.append("SELECT any_value(id) id, any_value(customer_no) customer_no,`customer_name`,any_value(sms_number) sms_number,any_value(network_access_time) network_access_time  " +
+            sql.append("SELECT any_value(id) id, customer_no customer_no,any_value(customer_name),any_value(sms_number) sms_number,any_value(network_access_time) network_access_time  " +
                     "FROM `sms_check_customer_info` " +
-                    "WHERE customer_name is not NULL");
+                    "WHERE customer_no is not NULL and del_flag = 0 and type in (1,2,4)");
             String customerNo = smsCheckCustomerInfo.getCustomerNo();
             String customerName = smsCheckCustomerInfo.getCustomerName();
             if (!StringUtils.isEmpty(customerNo)) {
                 String customerNoNow = customerNo.replace("*", "%");
-                sql.append(" WHERE `customer_no` like '" + customerNoNow + "'");
+                sql.append(" AND `customer_no` like '" + customerNoNow + "'");
                 if (!StringUtils.isEmpty(customerName)) {
                     String customerNameNow = customerName.replace("*", "%");
                     sql.append(" AND `customer_name` like '" + customerNameNow + "'");
@@ -223,10 +223,10 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
             } else {
                 if (!StringUtils.isEmpty(customerName)) {
                     String customerNameNow = customerName.replace("*", "%");
-                    sql.append(" WHERE `customer_name` like '" + customerNameNow + "'");
+                    sql.append(" AND `customer_name` like '" + customerNameNow + "'");
                 }
             }
-            sql.append(" GROUP BY `customer_name`");
+            sql.append(" GROUP BY `customer_no`");
             return sql.toString();
         }
     }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/vo/SmsCheckCustomerInfoVo.java

@@ -132,5 +132,8 @@ public class SmsCheckCustomerInfoVo implements Serializable {
     @ApiModelProperty(value = "备注")
     private String notes;
 
+    // 稽核类型
+    private Integer type;
+
 }