snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qyrecord/controller/QyRecordController.java

@@ -138,16 +138,14 @@ public class QyRecordController {
                     item.setStatus(devDict.getDictLabel());
                 }
                 //申报类型
-                String applyType = item.getApplyType();
-                parentId = "1808704091340812290";
-                devDict = devDictService.getOne(new QueryWrapper<DevDict>().checkSqlInjection().lambda()
-                        .eq(DevDict::getParentId, parentId)
-                        .eq(DevDict::getDictValue,applyType));
-                if (devDict != null){
-                    item.setApplyType(devDict.getDictLabel());
-                }else {
-                    item.setApplyType("备案申请");
-                }
+//                String applyType = item.getApplyType();
+//                parentId = "1808704091340812290";
+//                devDict = devDictService.getOne(new QueryWrapper<DevDict>().checkSqlInjection().lambda()
+//                        .eq(DevDict::getParentId, parentId)
+//                        .eq(DevDict::getDictValue,applyType));
+//                if (devDict != null){
+//                    item.setApplyType(devDict.getDictLabel());
+//                }
                 //备案类型
                 String baType = item.getBaType();
                 parentId = "1808704091340812290";
@@ -193,7 +191,6 @@ public class QyRecordController {
                 if (devDict != null){
                     item.setCompanyMainHgType(devDict.getDictLabel());
                 }
-
             });
         }
         exportExcel(response,QyRecord.class,records,"企业资质备案");

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qyrecord/entity/QyRecord.java

@@ -151,8 +151,8 @@ public class QyRecord {
 
     /** 申报类型 */
     @Schema(description = "申报类型")
-    @ColumnWidth(12)
-    @ExcelProperty(index = 19,value = "申报类型")
+//    @ColumnWidth(12)
+//    @ExcelProperty(index = 19,value = "申报类型")
     private String applyType;
 
     /** 申报时间 */

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qyrecord/service/impl/QyRecordServiceImpl.java

@@ -100,6 +100,9 @@ public class QyRecordServiceImpl extends ServiceImpl<QyRecordMapper, QyRecord> i
         if (i<0){
             qyRecord.setCreateTime(applyTime);
         }
+        if ("1".equals(qyRecord.getStatus())) {
+            qyRecord.setApplyTime(null);
+        }
         this.save(qyRecord);
     }
 

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qyrecordinfo/entity/QyRecordInfo.java

@@ -34,120 +34,120 @@ public class QyRecordInfo {
     /** ID */
     @TableId
     @Schema(description = "ID")
-    @ColumnWidth(12)
+    @ColumnWidth(20)
     @ExcelProperty(index = 0,value = "ID")
     private String id;
 
     /** 预录入台账编号 */
     @Schema(description = "预录入台账编号")
-    @ColumnWidth(12)
+    @ColumnWidth(20)
     @ExcelProperty(index = 1,value = "预录入台账编号")
     private String ylTzCode;
 
     /** 台账编号 */
     @Schema(description = "台账编号")
-    @ColumnWidth(12)
+    @ColumnWidth(20)
     @ExcelProperty(index = 2,value = "台账编号")
     private String tzCode;
 
     /** 台账性质 */
     @Schema(description = "台账性质")
-    @ColumnWidth(12)
+    @ColumnWidth(20)
     @ExcelProperty(index = 3,value = "台账性质")
     private String tzType;
 
     /** 海关注册编码 */
     @Schema(description = "海关注册编码")
-    @ColumnWidth(12)
+    @ColumnWidth(20)
     @ExcelProperty(index = 4,value = "海关注册编码")
     private String companyMainHgCode;
 
     /** 统一社会信用代码 */
     @Schema(description = "统一社会信用代码")
-    @ColumnWidth(12)
+    @ColumnWidth(20)
     @ExcelProperty(index = 5,value = "统一社会信用代码")
     private String companyCode;
 
     /** 企业名称 */
     @Schema(description = "企业名称")
-    @ColumnWidth(12)
+    @ColumnWidth(20)
     @ExcelProperty(index = 6,value = "企业名称")
     private String companyName;
 
     /** 申报类型 */
     @Schema(description = "申报类型")
-    @ColumnWidth(12)
+    @ColumnWidth(20)
     @ExcelProperty(index = 7,value = "申报类型")
     private String applyType;
 
     /** 企业类型 */
     @Schema(description = "企业类型")
-    @ColumnWidth(12)
+    @ColumnWidth(20)
     @ExcelProperty(index = 8,value = "企业类型")
     private String companyType;
 
     /** 企业地址 */
     @Schema(description = "企业地址")
-    @ColumnWidth(12)
+    @ColumnWidth(20)
     @ExcelProperty(index = 9,value = "企业地址")
     private String companyAddress;
 
     /** 联系人 */
     @Schema(description = "联系人")
-    @ColumnWidth(12)
+    @ColumnWidth(20)
     @ExcelProperty(index = 10,value = "联系人")
     private String companyLinkMan;
 
     /** 联系电话 */
     @Schema(description = "联系电话")
-    @ColumnWidth(12)
+    @ColumnWidth(20)
     @ExcelProperty(index = 11,value = "联系电话")
     private String companyLegalPhone;
 
     /** 经营范围 */
     @Schema(description = "经营范围")
-    @ColumnWidth(12)
-    @ExcelProperty(index = 12,value = "经营范围")
+    @ColumnWidth(20)
+    @ExcelProperty(index = 20,value = "经营范围")
     private String companyJyFw;
 
     /** 审核状态 */
     @Schema(description = "审核状态")
-    @ColumnWidth(12)
+    @ColumnWidth(20)
     @ExcelProperty(index = 13,value = "审核状态")
     private String status;
 
     /** 创建人 */
     @Schema(description = "创建人")
-    @ColumnWidth(12)
+    @ColumnWidth(20)
     @ExcelProperty(index = 14,value = "创建人")
     @TableField(fill = FieldFill.INSERT)
     private String createUser;
 
     /** 创建时间 */
     @Schema(description = "创建时间")
-    @ColumnWidth(12)
+    @ColumnWidth(20)
     @ExcelProperty(index = 15,value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
     /** 更新人 */
     @Schema(description = "更新人")
-    @ColumnWidth(12)
+    @ColumnWidth(20)
     @ExcelProperty(index = 16,value = "更新人")
     @TableField(fill = FieldFill.UPDATE)
     private String updateUser;
 
     /** 更新时间 */
     @Schema(description = "更新时间")
-    @ColumnWidth(12)
+    @ColumnWidth(20)
     @ExcelProperty(index = 17,value = "更新时间")
     @TableField(fill = FieldFill.UPDATE)
     private Date updateTime;
 
     /** 删除状态 */
     @Schema(description = "删除状态")
-    @ColumnWidth(12)
-    @ExcelProperty(index = 18,value = "删除状态")
+//    @ColumnWidth(20)
+//    @ExcelProperty(index = 18,value = "删除状态")
     @TableLogic
     @TableField(fill = FieldFill.INSERT)
     private String deleteFlag;

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qyrecordinfo/service/impl/QyRecordInfoServiceImpl.java

@@ -100,13 +100,22 @@ public class QyRecordInfoServiceImpl extends ServiceImpl<QyRecordInfoMapper, QyR
         } else {
             queryWrapper.lambda().orderByDesc(QyRecordInfo::getCreateTime);
         }
-        return this.page(CommonPageRequest.defaultPage(), queryWrapper);
+        Page<QyRecordInfo> page = this.page(CommonPageRequest.defaultPage(), queryWrapper);
+        page.getRecords().forEach(qyRecordInfo -> {
+            if ("1".equals(qyRecordInfo.getStatus())){
+                qyRecordInfo.setCreateTime(null);
+            }
+        });
+        return page;
     }
 
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(QyRecordInfoAddParam qyRecordInfoAddParam) {
         QyRecordInfo qyRecordInfo = BeanUtil.toBean(qyRecordInfoAddParam, QyRecordInfo.class);
+        if ("1".equals(qyRecordInfo.getStatus())){
+            qyRecordInfo.setCreateTime(null);
+        }
         this.save(qyRecordInfo);
         List<QyRecardBodyAddParam> qyRecardBodyAddParams = qyRecordInfoAddParam.getQyRecardBodyAddParams();
         //1、料件信息
@@ -144,6 +153,7 @@ public class QyRecordInfoServiceImpl extends ServiceImpl<QyRecordInfoMapper, QyR
                 qyRecordAttachmentService.save(qyRecordAttachment);
             });
         }
+
         QyRecordInfoCheckList qyRecordInfoCheckList = new QyRecordInfoCheckList();
         qyRecordInfoCheckList.setYlTzCode(qyRecordInfo.getYlTzCode());
         qyRecordInfoCheckList.setCheckTime(new Date());
@@ -186,6 +196,9 @@ public class QyRecordInfoServiceImpl extends ServiceImpl<QyRecordInfoMapper, QyR
     public void edit(QyRecordInfoEditParam qyRecordInfoEditParam) {
         QyRecordInfo qyRecordInfo = this.queryEntity(qyRecordInfoEditParam.getId());
         BeanUtil.copyProperties(qyRecordInfoEditParam, qyRecordInfo);
+        if ("1".equals(qyRecordInfo.getStatus())){
+            qyRecordInfo.setCreateTime(null);
+        }
         this.updateById(qyRecordInfo);
         qyRecardBodyService.remove(new LambdaQueryWrapper<QyRecardBody>().eq(QyRecardBody::getQyRecordInfoId, qyRecordInfo.getId()));
         qyRecordAttachmentService.remove(new LambdaQueryWrapper<QyRecordAttachment>().eq(QyRecordAttachment::getQyRecordInfoId, qyRecordInfo.getId()));