feat: 法规符合性评估库-查看
This commit is contained in:
+22
@@ -5,6 +5,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.aspect.annotation.AutoLog;
|
||||
import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibrary;
|
||||
import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibraryDetail;
|
||||
import com.jero.modules.assessmentLibrary.service.ILawsConformityAssessmentLibraryService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
@@ -46,4 +47,25 @@ public class LawsConformityAssessmentController {
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查看
|
||||
*
|
||||
* @param lawsConformityAssessmentLibraryDetail
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "法规符合性评估库-法规符合性评估库-查看")
|
||||
@ApiOperation(value = "法规符合性评估库-法规符合性评估库-查看", notes = "法规符合性评估库-法规符合性评估库-查看")
|
||||
@GetMapping(value = "/detail")
|
||||
@ApiOperationSupport(order = 1)
|
||||
@RequiresPermissions("lawsConformityAssessment:detail")
|
||||
public Result<IPage<LawsConformityAssessmentLibraryDetail>> detail(LawsConformityAssessmentLibraryDetail lawsConformityAssessmentLibraryDetail,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
|
||||
IPage<LawsConformityAssessmentLibraryDetail> pageList = lawsConformityAssessmentLibraryService
|
||||
.detail(lawsConformityAssessmentLibraryDetail, pageNo, pageSize);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
-6
@@ -51,12 +51,6 @@ public class LawsEvaluationNotMetController extends JeroController<LawsEvaluatio
|
||||
public Result<IPage<LawsEvaluationNotMetLibrary>> queryPageList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
LawsEvaluationNotMetLibrary lawsEvaluationNotMet, HttpServletRequest req) {
|
||||
if (pageNo == null) {
|
||||
pageNo = 1;
|
||||
}
|
||||
if (pageSize == null) {
|
||||
pageSize = 10;
|
||||
}
|
||||
IPage<LawsEvaluationNotMetLibrary> pageList = lawsEvaluationNotMetLibraryService.queryPage(lawsEvaluationNotMet, pageNo, pageSize, req);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
+13
-1
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
import com.jero.common.aspect.annotation.Dict;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@@ -17,6 +18,7 @@ import lombok.Data;
|
||||
@TableName(value ="laws_conformity_assessment_library_detail")
|
||||
@Data
|
||||
public class LawsConformityAssessmentLibraryDetail implements Serializable {
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@@ -76,19 +78,22 @@ public class LawsConformityAssessmentLibraryDetail implements Serializable {
|
||||
* 车型状态
|
||||
*/
|
||||
@ApiModelProperty(value = "车型状态")
|
||||
@Dict(dicCode = "model_status")
|
||||
private String modelStatus;
|
||||
|
||||
/**
|
||||
* 责任部门
|
||||
*/
|
||||
@ApiModelProperty(value = "责任部门")
|
||||
@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
|
||||
private String authDept;
|
||||
|
||||
/**
|
||||
* 评估人
|
||||
*/
|
||||
@ApiModelProperty(value = "评估人")
|
||||
private String userId;
|
||||
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
|
||||
private String assessor;
|
||||
|
||||
/**
|
||||
* 评估结果
|
||||
@@ -142,8 +147,15 @@ public class LawsConformityAssessmentLibraryDetail implements Serializable {
|
||||
* 佐证材料
|
||||
*/
|
||||
@ApiModelProperty(value = "佐证材料")
|
||||
@Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name")
|
||||
private String material;
|
||||
|
||||
/**
|
||||
* 关联主表Id
|
||||
*/
|
||||
@ApiModelProperty(value = "关联主表Id")
|
||||
private String bindId;
|
||||
|
||||
@TableField(exist = false)
|
||||
private static final long serialVersionUID = 1L;
|
||||
}
|
||||
+1
-1
@@ -107,7 +107,7 @@ public class LawsEvaluationNotMetLibrary implements Serializable {
|
||||
@ApiModelProperty(value = "评估人")
|
||||
@Excel(name = "评估人", width = 15, orderNum = "8", dictTable = "sys_user", dicCode = "id", dicText = "realname")
|
||||
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
|
||||
private String userId;
|
||||
private String assessor;
|
||||
|
||||
/**
|
||||
* 评估结果
|
||||
|
||||
+4
@@ -1,10 +1,12 @@
|
||||
package com.jero.modules.assessmentLibrary.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Constants;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibrary;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibraryDetail;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
/**
|
||||
@@ -16,6 +18,8 @@ import org.apache.ibatis.annotations.Param;
|
||||
public interface LawsConformityAssessmentLibraryMapper extends BaseMapper<LawsConformityAssessmentLibrary> {
|
||||
|
||||
Page<LawsConformityAssessmentLibrary> queryByPage(Page<LawsConformityAssessmentLibrary> page, @Param(Constants.WRAPPER) QueryWrapper<LawsConformityAssessmentLibrary> queryWrapper);
|
||||
|
||||
Page<LawsConformityAssessmentLibraryDetail> detail(Page<LawsConformityAssessmentLibraryDetail> page, @Param(Constants.WRAPPER) QueryWrapper<LawsConformityAssessmentLibraryDetail> queryWrapper);
|
||||
}
|
||||
|
||||
|
||||
|
||||
+9
@@ -30,4 +30,13 @@
|
||||
left join laws_domestic_standard as d on d.id = cs.standard_id
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
|
||||
<select id="detail"
|
||||
resultType="com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibraryDetail">
|
||||
select
|
||||
csd.*
|
||||
from laws_conformity_assessment_library_detail csd
|
||||
left join sys_user as u on u.id = csd.assessor
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
+17
@@ -3,6 +3,7 @@ package com.jero.modules.assessmentLibrary.service;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibrary;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibraryDetail;
|
||||
|
||||
/**
|
||||
* @author ThinkBook
|
||||
@@ -11,5 +12,21 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
||||
*/
|
||||
public interface ILawsConformityAssessmentLibraryService extends IService<LawsConformityAssessmentLibrary> {
|
||||
|
||||
/**
|
||||
* 分页列表
|
||||
* @param lawsConformityAssessmentLibrary
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @return
|
||||
*/
|
||||
IPage<LawsConformityAssessmentLibrary> queryPage(LawsConformityAssessmentLibrary lawsConformityAssessmentLibrary, Integer pageNo, Integer pageSize);
|
||||
|
||||
/**
|
||||
* 查看 分页列表
|
||||
* @param lawsConformityAssessmentLibraryDetail
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @return
|
||||
*/
|
||||
IPage<LawsConformityAssessmentLibraryDetail> detail(LawsConformityAssessmentLibraryDetail lawsConformityAssessmentLibraryDetail, Integer pageNo, Integer pageSize);
|
||||
}
|
||||
|
||||
+22
@@ -1,10 +1,12 @@
|
||||
package com.jero.modules.assessmentLibrary.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibrary;
|
||||
import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibraryDetail;
|
||||
import com.jero.modules.assessmentLibrary.service.ILawsConformityAssessmentLibraryService;
|
||||
import com.jero.modules.assessmentLibrary.mapper.LawsConformityAssessmentLibraryMapper;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -49,6 +51,26 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl<Laws
|
||||
Page<LawsConformityAssessmentLibrary> result = lawsConformityAssessmentLibraryMapper.queryByPage(page, queryWrapper);
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IPage<LawsConformityAssessmentLibraryDetail> detail(LawsConformityAssessmentLibraryDetail lawsConformityAssessmentLibraryDetail, Integer pageNo, Integer pageSize) {
|
||||
QueryWrapper<LawsConformityAssessmentLibraryDetail> queryWrapper = new QueryWrapper<>();
|
||||
Page<LawsConformityAssessmentLibraryDetail> page = new Page<>(pageNo, pageSize);
|
||||
queryWrapper.eq(StringUtils.isNotBlank(lawsConformityAssessmentLibraryDetail.getBindId()),
|
||||
"bind_id", lawsConformityAssessmentLibraryDetail.getBindId());
|
||||
queryWrapper.like(StringUtils.isNotBlank(lawsConformityAssessmentLibraryDetail.getTermNumber()),
|
||||
"term_number", lawsConformityAssessmentLibraryDetail.getTermNumber());
|
||||
queryWrapper.like(StringUtils.isNotBlank(lawsConformityAssessmentLibraryDetail.getModel()),
|
||||
"model", lawsConformityAssessmentLibraryDetail.getModel());
|
||||
queryWrapper.eq(StringUtils.isNotBlank(lawsConformityAssessmentLibraryDetail.getResult()),
|
||||
"result", lawsConformityAssessmentLibraryDetail.getResult());
|
||||
if (StringUtils.isNotBlank(lawsConformityAssessmentLibraryDetail.getAuthDept())) {
|
||||
queryWrapper.in("auth_dept", Arrays.asList(lawsConformityAssessmentLibraryDetail.getAuthDept().split(",")));
|
||||
}
|
||||
queryWrapper.like(StringUtils.isNotBlank(lawsConformityAssessmentLibraryDetail.getAssessor()),
|
||||
"CONCAT(u.realname, '(', u.username, ')')", lawsConformityAssessmentLibraryDetail.getAssessor());
|
||||
return lawsConformityAssessmentLibraryMapper.detail(page, queryWrapper);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
-2
@@ -11,10 +11,8 @@ import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.modules.assessmentLibrary.entity.LawsEvaluationNotMetLibrary;
|
||||
import com.jero.modules.assessmentLibrary.mapper.LawsEvaluationNotMetLibraryMapper;
|
||||
import com.jero.modules.assessmentLibrary.service.ILawsEvaluationNotMetLibraryService;
|
||||
import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardPlanVo;
|
||||
import com.jero.modules.projectLibrary.common.AssessCommon;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.catalina.connector.Request;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.poi.ss.usermodel.Workbook;
|
||||
import org.jeecgframework.poi.excel.ExcelExportUtil;
|
||||
|
||||
Reference in New Issue
Block a user