Merge branch 'develop_master' into 'FOTON'

Develop master See merge request LiuChao/foton-slrs-system-rest!364
2022-01-07 15:53:08 +08:00
parent 40fb539d7e b6f30bb322
commit a662082db3
8 changed files with 66 additions and 74 deletions
@@ -152,11 +152,11 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
        /**
         * 同一节点为多人评价时，需要取多人评价的平均分用以计算最终得分。
         * 各环节评分权重分别设置为30%、40%、30%，
-         * 即：标准编写质量最终得分=征求意见会签人评价平均分*30%+技术委员会专家评价平均分*40%+标准法规工程师和标准法规部主管领导评价平均分*30%。
+         * 即：标准编写质量最终得分=征求意见会签人评价平均分*30%+技术委员会专家评价平均分*40%+标准法规工程师  "和"  标准法规部主管领导评价平均分*30%。
         */
        result.putAll(list.stream()
                .collect(Collectors.groupingBy(QualityEvaluation::getEvaluationType,
-                        Collectors.averagingDouble(item ->{
+                        Collectors.summingDouble(item ->{

                            Double score;
                            String value;
@@ -173,10 +173,10 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
                                    score=Double.valueOf(item.getScore()) * 0.4;
                                    break;
                                case "标准法规工程师复审":
-                                    score=Double.valueOf(item.getScore()) * 0.3;
+                                    score=Double.valueOf(item.getScore()) * 0.15;
                                    break;
                                case "标准法规部部长审核":
-                                    score=Double.valueOf(item.getScore()) * 0.3;
+                                    score=Double.valueOf(item.getScore()) * 0.15;
                                    break;

                                default: score=Double.valueOf(item.getScore());
@@ -24,6 +24,8 @@ public interface SarStandUnqualifiedDao extends BaseMapper<SarStandUnqualified>

    List<SarStandUnqualified> getSarStandUnqualifiedPage(@Param("start")Integer start, @Param("end")Integer end, @Param("sar") SarStandUnqualifiedPage sarStandUnqualified);

+    List<SarStandUnqualified> getSarStandUnqualifiedExcel(@Param("ids")List<String> strings);
+
    Integer getSarStandUnqualifiedCount(@Param("sar") SarStandUnqualifiedPage sarStandUnqualified);

 }
@@ -142,11 +142,16 @@ public class SarStandUnqualified extends BaseEntity {
    @TableField("AUTH_ENGINEER")
    private String authEngineer;

-    @ExcelProperty("责任工程师")
+    @ExcelIgnore
    @ApiModelProperty(value = "责任工程师")
    @TableField("DUTY_ENGINEER")
    private String dutyEngineer;

+    @ExcelProperty("责任工程师")
+    @ApiModelProperty(value = "责任工程师")
+    @TableField(exist=false)
+    private String dutyEngineerName;
+
    @ExcelIgnore
    @ApiModelProperty(value = "计划关闭时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -177,10 +182,6 @@ public class SarStandUnqualified extends BaseEntity {
    @TableField(exist=false)
    private String authEngineerName;

-    @ExcelIgnore
-    @ApiModelProperty(value = "责任工程师")
-    @TableField(exist=false)
-    private String dutyEngineerName;

    @ExcelIgnore
    @ApiModelProperty(value = "国内OR海外")
@@ -148,12 +148,12 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
     */
    @Override
    public List<SarStandUnqualified> getStandUnqualifiedExcelData(StandUnqualifiedExcelVO standUnqualifiedExcelVO) {
-        QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
-        sarStandUnqualifiedQueryWrapper.eq("close_state",1);
-        if(standUnqualifiedExcelVO.getIds()!=null && standUnqualifiedExcelVO.getIds().size()>0){
-            sarStandUnqualifiedQueryWrapper.in("id",standUnqualifiedExcelVO.getIds());
-        }
-               List<SarStandUnqualified> stand = sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper);
+//        QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
+//        sarStandUnqualifiedQueryWrapper.eq("close_state",1);
+//        if(standUnqualifiedExcelVO.getIds()!=null && standUnqualifiedExcelVO.getIds().size()>0){
+//            sarStandUnqualifiedQueryWrapper.in("id",standUnqualifiedExcelVO.getIds());
+//        }
+        List<SarStandUnqualified> stand = sarStandUnqualifiedDao.getSarStandUnqualifiedExcel(standUnqualifiedExcelVO.getIds());
        //        去掉日期时分秒
        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");

@@ -210,59 +210,23 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
    @GetMapping("/getSarStandardsInfoPageBak")
    //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage")
    public ResponseMessage<PageInfo<SarStandardsInfo>> getSarStandardsInfoPageBak(SarStandardsInfoEOPage page,@RequestParam(defaultValue = "0") String mark) throws Exception {
-//        int isNull = -1;
-//        if (null != page.getNowOrderBy()) {
-//            switch (page.getNowOrderBy()) {
-//                case 1:
-//                    page.setOrderByA("issueTime");//发布日期
-//                    break;
-//                case 2:
-//                    page.setOrderByA("SAR_STAND_ATTR_INFO.ZCCSSRQ");//新车型实施日期
-//                    break;
-//                case 3:
-//                    page.setOrderByA("SAR_STAND_ATTR_INFO.XCXSSRQ");//在产车实施日期
-//                    break;
-//                case 4:
-//                    page.setOrderByA("SAR_STANDARDS_INFO.text_status");//文本状态
-//                    break;
-//                case 5:
-//                    page.setOrderByA("paixu");
-//                    break;
-//                case 6:
-//                    page.setOrderByA("SAR_STAND_ATTR_INFO.SSRQ");
-//                    break;
-//                default:
-//                    page.setNowOrder(null);
-//                    break;
-//            }
-//            if (null != page.getNowOrder()) {
-//                switch (page.getNowOrder()) {
-//                    case 1:
-//                        page.setOrder1("desc");
-//                        break;
-//                    case 2:
-//                        page.setOrder1("asc");
-//                    default:
-//                        page.setOrder1(null);
-//                        break;
-//                }
-//            }
-//        }
-//
-//
-//        if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
-//            List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
-//            String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList);
-//            if (StringUtils.isNotBlank(advanceStr)) {
-//                page.setAdvanceSearchStr(advanceStr);
-//            } else {
-//                page.setAdvanceSearchStr(null);
-//            }
-//        }
-//
-//        if(page.getUserId() == null || page.getUserId().equals("")){
-//            page.setUserId(LoginUserUtil.getUserId());
-//        }
+        if (null != page.getNowOrderBy()) {
+            nowOrderFunc(page);
+        }
+
+        if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
+            List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
+            String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList);
+            if (StringUtils.isNotBlank(advanceStr)) {
+                page.setAdvanceSearchStr(advanceStr);
+            } else {
+                page.setAdvanceSearchStr(null);
+            }
+        }
+
+        if(page.getUserId() == null || page.getUserId().equals("")){
+            page.setUserId(LoginUserUtil.getUserId());
+        }
        List<SarStandardsInfo> rows = sarStandardsInfoEOService.getSarStandardsInfoPageBak1(page);
        return Result.success(getPageInfo(page.getPager(), rows));
    }
@@ -275,7 +275,8 @@ public class SarFileSplitInfoEOController extends BaseController<SarFileSplitInf
        if(null!=sarFileSplitInfoEO){
            sarFileSplitInfoEO.setModifyTime(new Date());
            if (null==sarFileSplitInfoEO.getSplitStatus())
-            sarFileSplitInfoEO.setSplitStatus("1");
+                sarFileSplitInfoEO.setStandId(null);
+//            sarFileSplitInfoEO.setSplitStatus("1");
            sarFileSplitInfoEOService.updateByPrimaryKeySelective(sarFileSplitInfoEO);
            return Result.success("0","编辑成功",null);
        }else{