ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 设置优质标准

Browse Source
This commit is contained in:
mzaxd
2023-09-11 15:39:15 +08:00
parent d8a71bdaa5
commit 37ae76ee92
11 changed files with 56 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java
+2
View File
@@ -13,4 +13,6 @@ public class ResultCommon {
public static final String ERROR = "message.error"; // 操作失败
public static final String RMR_SET_QUALITY_OVER_TEN = "es.rmr.setQuality.overTen"; // 请最多选择10条
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardReviewMeetingController.java
+19 -1
View File
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardReviewMeetingRecord;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRmrEvaluateDetail;
import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO;
@@ -17,7 +19,6 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
import java.util.List;
import java.util.Map;
@@ -63,4 +64,21 @@ public class EnterpriseStandardReviewMeetingController extends JeroController<En
Map<String, List<EnterpriseStandardRmrEvaluateDetail>> resultMap = esReviewMeetingService.evaluateDetail(id);
return Result.OK(resultMap);
}
/**
* 分页列表查询
*
* @return
*/
@AutoLog(value = "企标评审会-设置优质标准")
@ApiOperation(value="企标评审会-设置优质标准", notes="企标评审会-设置优质标准")
@GetMapping(value = "/setQualityStandards")
public Result<?> setQualityStandards(@RequestParam String standardNos) {
List<String> standardNoList = Arrays.asList(standardNos.split(","));
if (standardNoList.size() > 10) {
return Result.error(MessageUtils.getMessage(ResultCommon.RMR_SET_QUALITY_OVER_TEN));
}
esReviewMeetingService.setQualityStandards(standardNoList);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
}
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java
+4
View File
@@ -183,4 +183,8 @@ public class EnterpriseStandardPlan implements Serializable {
@ApiModelProperty(value = "附件")
private String attachement;
/**是否为优质标准*/
@ApiModelProperty(value = "是否为优质标准")
private String qualityFlag;
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardReviewMeetingRecord.java
-4
View File
@@ -71,8 +71,4 @@ public class EnterpriseStandardReviewMeetingRecord implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "评审日期")
private Date reviewDate;
/**是否为优质标准*/
@ApiModelProperty(value = "是否为优质标准")
private String qualityFlag;
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml
+2 -1
View File
@@ -55,6 +55,7 @@
<result property="projectExpectedEffects" column="project_expected_effects" jdbcType="VARCHAR"/>
<result property="remarks" column="remarks" jdbcType="VARCHAR"/>
<result property="attachement" column="attachement" jdbcType="VARCHAR"/>
<result property="qualityFlag" column="quality_flag" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
@@ -74,6 +75,6 @@
review_date,approval_date,release_date,
change_status,project_background,similar_na_standards_analysis,
similar_en_standards_analysis,standard_leading_necessity,project_expected_effects,
remarks,attachement
remarks,attachement,qualityFlag
</sql>
</mapper>
laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml
+3 -3
View File
@@ -14,7 +14,6 @@
<result property="standardId" column="standard_id" jdbcType="VARCHAR"/>
<result property="standardNo" column="standard_no" jdbcType="VARCHAR"/>
<result property="reviewDate" column="review_date" jdbcType="TIMESTAMP"/>
<result property="qualityFlag" column="quality_flag" jdbcType="VARCHAR"/>
</resultMap>
<select id="page" resultType="com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardReviewMeetingVo">
@@ -25,7 +24,7 @@
esp.mainDraftingUser,
esp.mainDraftingUnit,
rmr.review_date AS reviewDate,
rmr.quality_flag AS qualityFlag,
esp.qualityFlag,
(score.avg_score_item1 + score.avg_score_item2 + score.avg_score_item3 +
score.avg_score_item4 + score.avg_score_item5 + score.avg_score_item6) AS avgScore,
GROUP_CONCAT(DISTINCT CONCAT(u.username, '（', u.work_no, '）') ORDER BY u.username ASC SEPARATOR '，') AS reviewUsers
@@ -37,6 +36,7 @@
esp.id,
esp.new_en_standard_no AS standardNo,
esp.new_en_standard_name AS standardName,
esp.quality_flag AS qualityFlag,
u.username AS mainDraftingUser,
d.depart_name AS mainDraftingUnit
FROM
@@ -77,7 +77,7 @@
<if test="param.reviewStartDate != null and param.reviewEndDate != null">
AND rmr.review_date BETWEEN #{param.reviewStartDate} AND #{param.reviewEndDate}
</if>
GROUP BY rmr.id, esp.standardNo, esp.standardName, esp.mainDraftingUser, esp.mainDraftingUnit, rmr.review_date, rmr.quality_flag, score.avg_score_item1, score.avg_score_item2, score.avg_score_item3, score.avg_score_item4, score.avg_score_item5, score.avg_score_item6
GROUP BY rmr.id, esp.standardNo, esp.standardName, esp.mainDraftingUser, esp.mainDraftingUnit, rmr.review_date, esp.qualityFlag, score.avg_score_item1, score.avg_score_item2, score.avg_score_item3, score.avg_score_item4, score.avg_score_item5, score.avg_score_item6
ORDER BY
avgScore DESC,
score.avg_score_item2 DESC,
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardReviewMeetingRecordService.java
+6
View File
@@ -32,4 +32,10 @@ public interface EnterpriseStandardReviewMeetingRecordService extends IService<E
* @return
*/
Map<String, List<EnterpriseStandardRmrEvaluateDetail>> evaluateDetail(String id);
/**
* 设置优质标准
* @param standardNos
*/
void setQualityStandards(List<String> standardNos);
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardReviewMeetingRecordServiceImpl.java
+13 -2
View File
@@ -8,19 +8,19 @@ import com.jero.common.constant.enums.YesOrNoEnum;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.vo.DictModel;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardReviewMeetingRecord;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRmrEvaluateDetail;
import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO;
import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardReviewMeetingVo;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardReviewMeetingRecordService;
import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardReviewMeetingRecordMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -43,6 +43,9 @@ public class EnterpriseStandardReviewMeetingRecordServiceImpl extends ServiceImp
@Resource
private EnterpriseStandardReviewMeetingRecordMapper esReviewMeetingMapper;
@Resource
private EnterpriseStandardPlanService esPlanService;
@Override
public IPage<EnterpriseStandardReviewMeetingVo> queryPageList(ESQueryCommonDTO esReviewMeeting, Integer pageNo, Integer pageSize) {
IPage<EnterpriseStandardReviewMeetingVo> page = new Page<>(pageNo, pageSize);
@@ -62,6 +65,14 @@ public class EnterpriseStandardReviewMeetingRecordServiceImpl extends ServiceImp
return resultMap;
}
@Override
public void setQualityStandards(List<String> standardNos) {
LambdaUpdateWrapper<EnterpriseStandardPlan> espWrapper = new LambdaUpdateWrapper<>();
espWrapper.in(EnterpriseStandardPlan::getNewEnStandardNo, standardNos).set(EnterpriseStandardPlan::getQualityFlag, YesOrNoEnum.YES.getValue());
// 设置为优质标准
esPlanService.update(espWrapper);
}
// 转换列表中的状态值为中文
private void transReviewMeetingVo(List<EnterpriseStandardReviewMeetingVo> list) {
if (list.isEmpty()) {
laws-single-startup/src/main/resources/i18n/messages.properties
+2 -1
View File
@@ -6,4 +6,5 @@ tag.edit.\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u4FEE\u6539=\u56FA\u5B9A\u5B57\u6
tag.edit.\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u5220\u9664=\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u5220\u9664
tag.edit.\u5C5E\u6027\u5DF2\u5B58\u5728,\u8BF7\u68C0\u67E5=\u5C5E\u6027\u5DF2\u5B58\u5728,\u8BF7\u68C0\u67E5
message.ok=\u64CD\u4F5C\u6210\u529F
message.error=\u64CD\u4F5C\u5931\u8D25
message.error=\u64CD\u4F5C\u5931\u8D25
es.rmr.setQuality.overTen=\u8BF7\u6700\u591A\u9009\u62E910\u6761
laws-single-startup/src/main/resources/i18n/messages_en.properties
+2 -1
View File
@@ -6,4 +6,5 @@ tag.edit.\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u4FEE\u6539=Fixed field, which ca
tag.edit.\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u5220\u9664=Fixed field, cannot be deleted.
tag.edit.\u5C5E\u6027\u5DF2\u5B58\u5728,\u8BF7\u68C0\u67E5=Attribute already exists, please check!
message.ok=Successful operation
message.error=Operation failure
message.error=Operation failure
es.rmr.setQuality.overTen=Please select up to 10
laws-single-startup/src/main/resources/i18n/messages_zh.properties
+3 -2
View File
@@ -5,5 +5,6 @@ tag.delete.\u5305\u542B\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u5220\u9664=\u5305\
tag.edit.\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u4FEE\u6539=\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u4FEE\u6539
tag.edit.\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u5220\u9664=\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u5220\u9664
tag.edit.\u5C5E\u6027\u5DF2\u5B58\u5728,\u8BF7\u68C0\u67E5=\u5C5E\u6027\u5DF2\u5B58\u5728,\u8BF7\u68C0\u67E5
message.ok=\u64cd\u4f5c\u6210\u529f
message.error=\u64cd\u4f5c\u5931\u8d25
message.ok=\u64CD\u4F5C\u6210\u529F
message.error=\u64CD\u4F5C\u5931\u8D25
es.rmr.setQuality.overTen=\u8BF7\u6700\u591A\u9009\u62E910\u6761