WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

上报库-历史log新增增加备注，历史列表增加备注展示。。

Browse Source 
上报库-参数项列表-去除备注展示。
This commit is contained in:
wangzhijiang
2022-12-12 10:57:04 +08:00
parent 4b62c059dc
commit 9dd34bd320
7 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/db/蔚来标准sql/dev_2nd_period.sql
+6 -1
View File
@@ -73,4 +73,9 @@ INSERT INTO `laws_weilai`.`onl_cgform_field`(`id`, `cgform_head_id`, `db_field_n
ALTER TABLE `laws_weilai`.`params_manifest_history`
ADD COLUMN `references_col_name` varchar(255) NULL COMMENT '参数项清单的参考列名称' AFTER `project_version_id`;
ALTER TABLE `laws_weilai`.`params_info_publish`
CHANGE COLUMN `version` `publish_version` int(11) NULL DEFAULT NULL COMMENT '发布时版本' AFTER `params_template_id`;
CHANGE COLUMN `version` `publish_version` int(11) NULL DEFAULT NULL COMMENT '发布时版本' AFTER `params_template_id`;
-- 上报库历史表，增加备注字段 2022-12-12 未同步生产环境
ALTER TABLE `laws_weilai`.`params_report_detail_log`
ADD COLUMN `remarks` varchar(4000) NULL COMMENT '备注' AFTER `params_report_detail_id`;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+4 -9
View File
@@ -581,12 +581,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@RequestParam(value = "paramsReportId") String paramsReportId,
@RequestParam(value = "paramsReportConfigId") String paramsReportConfigId,
@RequestParam(value = "paramsReportConfigName") String paramsReportConfigName) {
boolean isSuccess = paramsCollectManifestEOService.addReferencesCol(paramsManifestId, paramsReportId, paramsReportConfigId, paramsReportConfigName);
if (isSuccess) {
return Result.OK("引用参考列成功！");
} else {
return Result.error("引用参考列失败！");
}
return this.paramsCollectManifestEOService.addReferencesCol(paramsManifestId, paramsReportId, paramsReportConfigId, paramsReportConfigName);
}
/**
@@ -653,13 +648,13 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
}
/**
* 撤回
* 认证工程师-强制撤回
*
* @param paramsCollectManifestVO
* @return
*/
@AutoLog(value = "参数项收集清单-强制撤回")
@ApiOperation(value="参数项收集清单-强制撤回", notes="参数项收集清单-强制撤回")
@AutoLog(value = "参数项收集清单-认证工程师-强制撤回")
@ApiOperation(value="参数项收集清单-认证工程师-强制撤回", notes="参数项收集清单-认证工程师-强制撤回")
@PostMapping(value = "/mandatoryWithdraw")
public Result<?> mandatoryWithdraw(ParamsCollectManifestVO paramsCollectManifestVO) {
return this.paramsCollectManifestEOService.mandatoryWithdraw(paramsCollectManifestVO);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
+1 -1
View File
@@ -183,7 +183,7 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
void checkDeadline();
// 认证工程师-引用参考列
boolean addReferencesCol(String paramsManifestId, String paramsReportId, String paramsReportConfigId, String paramsReportConfigName);
Result<?> addReferencesCol(String paramsManifestId, String paramsReportId, String paramsReportConfigId, String paramsReportConfigName);
// 认证工程师-更新参考列
boolean updateReferencesCol(List<Map<String, Object>> configDataList, String paramsManifestId);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+11 -2
View File
@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ZipUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -4975,7 +4976,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
}
@Override
public boolean addReferencesCol(String paramsManifestId, String paramsReportId, String paramsReportConfigId, String paramsReportConfigName) {
public Result<?> addReferencesCol(String paramsManifestId, String paramsReportId, String paramsReportConfigId, String paramsReportConfigName) {
// 获取清单参数项
ParamsCollectManifestEO queryEO = new ParamsCollectManifestEO();
queryEO.setParamsManifestId(paramsManifestId);
@@ -5027,7 +5028,15 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
paramsManifestEOService.updateById(paramsManifestEO);
// 修改参数项 参考列
return updateBatchById(updateEOList);
try {
updateBatchById(updateEOList);
}catch (Exception ex){
ex.printStackTrace();
log.error("修改参数项，参考列失败: " + ex.getMessage());
throw new JeroBootException("引用参考列失败！");
}
return Result.OK("引用参考列成功！");
}
@Override
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailLogEO.java
+4
View File
@@ -85,4 +85,8 @@ public class ParamsReportDetailLogEO implements Serializable {
@TableField(exist = false)
private String logContent;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private java.lang.String remarks;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailLogEOMapper.xml
+3 -2
View File
@@ -13,6 +13,7 @@
<result column="params_report_id" property="paramsReportId" />
<result column="params_report_detail_id" property="paramsReportDetailId" />
<result column="log_Content" property="logContent" />
<result column="remarks" property="remarks" />
</resultMap>
<select id="listByReportIdOrReportDetailId" resultMap="ParamsReportDetailLogEOResultMap">
@@ -29,7 +30,7 @@
</select>
<select id="pageInfo" resultMap="ParamsReportDetailLogEOResultMap">
select id, create_time, create_by, params_report_id, params_report_detail_id,
select id, create_time, create_by, params_report_id, params_report_detail_id,remarks,
<if test="cut == 'cn'">
log_cn_content as log_Content
</if>
@@ -40,4 +41,4 @@
where params_report_detail_id = #{paramsReportDetailId}
order by create_time desc
</select>
</mapper>
</mapper>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+9
View File
@@ -137,6 +137,10 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
List<Map<String, Object>> listMap = new ArrayList<>();
list.forEach(collectManifestEO -> { // 参数收集清单
// 2022-12-12 上报库 参数项查看列表 备注设置为空。
collectManifestEO.setRemarks(null);
// 处理数据字典字段 中英文切换 认证类型，责任领域
List<String> certCategory = Arrays.asList(collectManifestEO.getCertCategory().split(","));
List<String> dutyTerritory = Arrays.asList(collectManifestEO.getDutyTerritory().split(","));
@@ -1730,10 +1734,15 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
}
ParamsReportDetailLogEO insertLogEO = new ParamsReportDetailLogEO();
if (logCnContent.toString().endsWith("，")) {
String ramarks = "";
if(map.get("remarks") != null){
ramarks = map.get("remarks").toString();
}
insertLogEO.setLogCnContent(logCnContent.toString().substring(0, logCnContent.lastIndexOf("，")));
insertLogEO.setLogEnContent(logEnContent.toString().substring(0, logEnContent.lastIndexOf(",")));
insertLogEO.setParamsReportId(paramsManifestId);
insertLogEO.setParamsReportDetailId(paramsCollectManifestId);
insertLogEO.setRemarks(ramarks);
insertLogEOList.add(insertLogEO);
}
}