diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleTemplatePrintMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleTemplatePrintMapper.java index 383bf2f..f459bc0 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleTemplatePrintMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleTemplatePrintMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.file.ModuleTemplatePrintConfig; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** @@ -13,4 +14,9 @@ @Select(" SELECT IFNULL(max(RIGHT(module_file_no, 12)), 0) " + " from biz_module_template_print_config ") Long selectMaxNo(); + + @Select(" SELECT template_name " + + " FROM system_template " + + " WHERE id=#{id} ") + String getTemplateName(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleTemplatePrintMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleTemplatePrintMapper.java index 383bf2f..f459bc0 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleTemplatePrintMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleTemplatePrintMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.file.ModuleTemplatePrintConfig; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** @@ -13,4 +14,9 @@ @Select(" SELECT IFNULL(max(RIGHT(module_file_no, 12)), 0) " + " from biz_module_template_print_config ") Long selectMaxNo(); + + @Select(" SELECT template_name " + + " FROM system_template " + + " WHERE id=#{id} ") + String getTemplateName(@Param("id") Long id); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java index 53f08c3..8fb303a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java @@ -43,6 +43,10 @@ @TableField("template_file_id") private Long templateFileId; + @TableField(exist = false) + private String templateFileName; + + @ApiModelProperty("模板字段id") @TableField("module_field_id") private Long moduleFieldId; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleTemplatePrintMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleTemplatePrintMapper.java index 383bf2f..f459bc0 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleTemplatePrintMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleTemplatePrintMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.file.ModuleTemplatePrintConfig; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** @@ -13,4 +14,9 @@ @Select(" SELECT IFNULL(max(RIGHT(module_file_no, 12)), 0) " + " from biz_module_template_print_config ") Long selectMaxNo(); + + @Select(" SELECT template_name " + + " FROM system_template " + + " WHERE id=#{id} ") + String getTemplateName(@Param("id") Long id); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java index 53f08c3..8fb303a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java @@ -43,6 +43,10 @@ @TableField("template_file_id") private Long templateFileId; + @TableField(exist = false) + private String templateFileName; + + @ApiModelProperty("模板字段id") @TableField("module_field_id") private Long moduleFieldId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintReponse.java index b5cde93..319f333 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintReponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintReponse.java @@ -1,5 +1,6 @@ package com.casic.missiles.dto.system; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -48,12 +49,14 @@ * 创建时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** * 更新时间 */ @TableField("update_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleTemplatePrintMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleTemplatePrintMapper.java index 383bf2f..f459bc0 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleTemplatePrintMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleTemplatePrintMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.file.ModuleTemplatePrintConfig; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** @@ -13,4 +14,9 @@ @Select(" SELECT IFNULL(max(RIGHT(module_file_no, 12)), 0) " + " from biz_module_template_print_config ") Long selectMaxNo(); + + @Select(" SELECT template_name " + + " FROM system_template " + + " WHERE id=#{id} ") + String getTemplateName(@Param("id") Long id); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java index 53f08c3..8fb303a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java @@ -43,6 +43,10 @@ @TableField("template_file_id") private Long templateFileId; + @TableField(exist = false) + private String templateFileName; + + @ApiModelProperty("模板字段id") @TableField("module_field_id") private Long moduleFieldId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintReponse.java index b5cde93..319f333 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintReponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintReponse.java @@ -1,5 +1,6 @@ package com.casic.missiles.dto.system; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -48,12 +49,14 @@ * 创建时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** * 更新时间 */ @TableField("update_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignImageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignImageResponse.java index 1a2fdf6..b302a5f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignImageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignImageResponse.java @@ -26,6 +26,6 @@ * 关键字 */ @ApiModelProperty("关键字") - private String keyWords; + private String keywords; } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleTemplatePrintMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleTemplatePrintMapper.java index 383bf2f..f459bc0 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleTemplatePrintMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleTemplatePrintMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.file.ModuleTemplatePrintConfig; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** @@ -13,4 +14,9 @@ @Select(" SELECT IFNULL(max(RIGHT(module_file_no, 12)), 0) " + " from biz_module_template_print_config ") Long selectMaxNo(); + + @Select(" SELECT template_name " + + " FROM system_template " + + " WHERE id=#{id} ") + String getTemplateName(@Param("id") Long id); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java index 53f08c3..8fb303a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java @@ -43,6 +43,10 @@ @TableField("template_file_id") private Long templateFileId; + @TableField(exist = false) + private String templateFileName; + + @ApiModelProperty("模板字段id") @TableField("module_field_id") private Long moduleFieldId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintReponse.java index b5cde93..319f333 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintReponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintReponse.java @@ -1,5 +1,6 @@ package com.casic.missiles.dto.system; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -48,12 +49,14 @@ * 创建时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** * 更新时间 */ @TableField("update_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignImageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignImageResponse.java index 1a2fdf6..b302a5f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignImageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignImageResponse.java @@ -26,6 +26,6 @@ * 关键字 */ @ApiModelProperty("关键字") - private String keyWords; + private String keywords; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java index 1f5f1d5..bc3fcca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java @@ -59,11 +59,11 @@ * 创建时间 */ @TableField("create_time") - private LocalDateTime createTime; + private String createTime; /** * 更新时间 */ @TableField("update_time") - private LocalDateTime updateTime; + private String updateTime; } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleTemplatePrintMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleTemplatePrintMapper.java index 383bf2f..f459bc0 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleTemplatePrintMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleTemplatePrintMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.file.ModuleTemplatePrintConfig; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** @@ -13,4 +14,9 @@ @Select(" SELECT IFNULL(max(RIGHT(module_file_no, 12)), 0) " + " from biz_module_template_print_config ") Long selectMaxNo(); + + @Select(" SELECT template_name " + + " FROM system_template " + + " WHERE id=#{id} ") + String getTemplateName(@Param("id") Long id); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java index 53f08c3..8fb303a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintDetail.java @@ -43,6 +43,10 @@ @TableField("template_file_id") private Long templateFileId; + @TableField(exist = false) + private String templateFileName; + + @ApiModelProperty("模板字段id") @TableField("module_field_id") private Long moduleFieldId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintReponse.java index b5cde93..319f333 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintReponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/ModuleTemplatePrintReponse.java @@ -1,5 +1,6 @@ package com.casic.missiles.dto.system; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -48,12 +49,14 @@ * 创建时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** * 更新时间 */ @TableField("update_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignImageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignImageResponse.java index 1a2fdf6..b302a5f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignImageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignImageResponse.java @@ -26,6 +26,6 @@ * 关键字 */ @ApiModelProperty("关键字") - private String keyWords; + private String keywords; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java index 1f5f1d5..bc3fcca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java @@ -59,11 +59,11 @@ * 创建时间 */ @TableField("create_time") - private LocalDateTime createTime; + private String createTime; /** * 更新时间 */ @TableField("update_time") - private LocalDateTime updateTime; + private String updateTime; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java index 74a992b..b08422e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java @@ -48,10 +48,12 @@ public Page fileTemplateListPage(Page page, ModuleTypeRequest request) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(StringUtils.isNotEmpty(request.getModuleName()), "module_Name", request.getModuleName()); - queryWrapper.eq(StringUtils.isNotEmpty(request.getModuleTypeName()), "module_type_name", request.getModuleTypeName()); + queryWrapper.eq(StringUtils.isNotEmpty(request.getModuleTypeName()), "module_type", request.getModuleTypeName()); + queryWrapper.orderByDesc("create_time"); page = this.baseMapper.selectPage(page, queryWrapper); Page moduleTemplatePage = PageFactory.defaultPage(); moduleTemplatePage.setRecords(ConvertUtils.sourceToTarget(page.getRecords(), ModuleTemplatePrintReponse.class)); + moduleTemplatePage.setTotal(page.getTotal()); return moduleTemplatePage; } @@ -115,6 +117,7 @@ public ModuleTemplatePrintDetail fileTemplateDetail(Long id) { ModuleTemplatePrintConfig moduleTemplatePrintConfig = this.baseMapper.selectById(id); ModuleTemplatePrintDetail moduleTemplatePrintDetail = ConvertUtils.sourceToTarget(moduleTemplatePrintConfig, ModuleTemplatePrintDetail.class); + moduleTemplatePrintDetail.setTemplateFileName(this.baseMapper.getTemplateName(moduleTemplatePrintDetail.getTemplateFileId())); List signImageResponses = jsonToDto(moduleTemplatePrintDetail.getSigns()); moduleTemplatePrintDetail.setSignImageResponseList(signImageResponses); //添加图片信息,关联表的信息,关联表信息同时json化 @@ -127,6 +130,7 @@ List relateModuleFieldList = Arrays.asList(relateModuleFieldIds); moduleFieldConfigList.addAll(moduleFieldMapper.selectBatchIds(relateModuleFieldList)); } + moduleTemplatePrintDetail.setModuleFieldConfigList(moduleFieldConfigList); return moduleTemplatePrintDetail; } @@ -135,7 +139,7 @@ for (SignImageResponse signImageResponse : signImageResponses) { Map signMap = new HashMap<>(); signMap.put("signId", signImageResponse.getId()); - signMap.put("keyWords", signImageResponse.getKeyWords()); + signMap.put("keywords", signImageResponse.getKeywords()); signMapList.add(signMap); } return JSON.toJSONString(signMapList); @@ -158,7 +162,7 @@ } List signImageResponses = ConvertUtils.sourceToTarget(bizResourceSealInfo, SignImageResponse.class); for (SignImageResponse signImageResponse : signImageResponses) { - signImageResponse.setKeyWords(KeyWordMap.get(signImageResponse.getId())); + signImageResponse.setKeywords(KeyWordMap.get(signImageResponse.getId())); } return signImageResponses; }