Merge branch 'develop_3' into 'develop_master'
Develop 3 See merge request LiuChao/foton-slrs-system-rest!385
This commit is contained in:
王夏晖
+3
-3
@@ -172,13 +172,13 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
|
||||
case "会签征求意见":
|
||||
score=Double.valueOf(item.getScore()) * 0.3;
|
||||
break;
|
||||
case "技术委员会负责人/起草中心主任审核":
|
||||
case "技术委员会评审/评审意见修改评审":
|
||||
score=Double.valueOf(item.getScore()) * 0.4;
|
||||
break;
|
||||
case "标准法规工程师复审":
|
||||
case "标准法规部标准化工程师复审":
|
||||
score=Double.valueOf(item.getScore()) * 0.15;
|
||||
break;
|
||||
case "标准法规部部长审核":
|
||||
case "标准法规部高级经理审核":
|
||||
score=Double.valueOf(item.getScore()) * 0.15;
|
||||
break;
|
||||
|
||||
|
||||
+19
-2
@@ -4,6 +4,8 @@ import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao;
|
||||
import com.adc.da.slrs.sarLawsAttrDetailedList.entity.*;
|
||||
import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListService;
|
||||
import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto;
|
||||
import com.adc.da.sys.common.SelectionResult;
|
||||
import com.adc.da.sys.dao.DicTypeEODao;
|
||||
import com.adc.da.sys.service.IDicTypeEOService;
|
||||
import com.adc.da.util.UUIDUtils;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
@@ -19,6 +21,7 @@ import org.springframework.util.CollectionUtils;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
@@ -253,11 +256,25 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
|
||||
return sarLawsAttrDetailedListDao.updateById(sarLawsAttrDetailedList);
|
||||
}
|
||||
|
||||
|
||||
@Autowired
|
||||
private DicTypeEODao dicTypeEODao;
|
||||
|
||||
@Override
|
||||
public Map<String, List<String>> selectTimes(String id) {
|
||||
List<StandRegionalTimeDto> standRegionalTimeDto= sarLawsAttrDetailedListDao.selectTimes(id);
|
||||
Map<String, Object> map = iDicTypeEOService.getDicTypeListCode();
|
||||
List<Map<String, String>> arr = (List<Map<String, String>>) map.get("COUNTRY");
|
||||
|
||||
// 查询国家地区字典
|
||||
List<SelectionResult> dicTypeList = dicTypeEODao.getDicTypeByDicId("RFRFRFSCXVB");
|
||||
List<Map<String, String>> arr = dicTypeList.stream()
|
||||
.map(item -> {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
map.put("lable", item.getLabel());
|
||||
map.put("value", item.getValue());
|
||||
return map;
|
||||
}).collect(Collectors.toList());
|
||||
// Map<String, Object> map = iDicTypeEOService.getDicTypeListCode();
|
||||
// List<Map<String, String>> arr = (List<Map<String, String>>) map.get("COUNTRY");
|
||||
for (StandRegionalTimeDto list1 : standRegionalTimeDto) {
|
||||
if (StringUtils.isNotBlank(list1.getCountry()) && list1.getCountry().contains(",")) {
|
||||
String[] split = list1.getCountry().split(",");
|
||||
|
||||
+42
@@ -14,6 +14,8 @@ import com.adc.da.http.Result;
|
||||
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
|
||||
import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
|
||||
import com.adc.da.slrs.sarLawsInfo.service.ISarLawsInfoService;
|
||||
import com.adc.da.slrs.sarStandMenu.dao.SarStandMenuDao;
|
||||
import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu;
|
||||
import com.adc.da.slrs.sarStandardsInfo.entity.*;
|
||||
import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService;
|
||||
import com.adc.da.util.LoginUserUtil;
|
||||
@@ -553,6 +555,46 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
|
||||
|
||||
}
|
||||
|
||||
@ApiOperation(value = "在入库流程中配置单个标准的 体系目录 体系目录可以是多个")
|
||||
@PostMapping("/saveStandardsMenuForFlow")
|
||||
public ResponseMessage saveStandardsMenuForFlow(@RequestBody SarStandardsInfoEOPage standardsInfoEO) throws Exception {
|
||||
boolean flag = false;
|
||||
for (String id : Arrays.asList(standardsInfoEO.getMenuIds().split(","))) {
|
||||
standardsInfoEO.setMenuId(id);
|
||||
|
||||
try {
|
||||
flag = sarStandardsInfoEOService.updateStandardsMenu(standardsInfoEO);
|
||||
}catch (NullPointerException e){
|
||||
flag = sarStandardsInfoEOService.updateStandInfo(standardsInfoEO);
|
||||
}
|
||||
|
||||
if (flag){
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
if (flag){
|
||||
return Result.success("200","配置成功",true);
|
||||
}
|
||||
return Result.error("-1","配置失败");
|
||||
|
||||
}
|
||||
|
||||
@Autowired
|
||||
SarStandMenuDao sarStandMenuDao;
|
||||
@ApiOperation(value = "查询标准所在的 体系目录")
|
||||
@GetMapping("/getStandMenuId")
|
||||
public ResponseMessage<List<SarStandMenu>> getStandMenuId(SarStandMenu getStandId){
|
||||
|
||||
List<SarStandMenu> sarStandMenus = sarStandMenuDao.selectAllMenuByStandId(getStandId);
|
||||
|
||||
return Result.success(sarStandMenus);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation(value = "|SarStandardsInfoEO|详情页面查询相近标准")
|
||||
@GetMapping("/selectCloseStand")
|
||||
//@RequiresPermissions("lawss:sarStandardsInfo:list")
|
||||
|
||||
+5
@@ -103,4 +103,9 @@ public class SarStandardsInfoEOPage extends BasePage {
|
||||
* 日期范围查询发布日期结束
|
||||
*/
|
||||
private String endIssueTime;
|
||||
|
||||
/**
|
||||
* 标准添加到体系中的id多个
|
||||
*/
|
||||
private String menuIds;
|
||||
}
|
||||
|
||||
@@ -788,7 +788,8 @@
|
||||
WHERE b.VALID_FLAG = 0
|
||||
</select>
|
||||
<select id="getFileType" resultType="java.lang.String">
|
||||
SELECT FILE_type from sar_stand_items WHERE STAND_ID = #{standId} GROUP BY FILE_TYPE
|
||||
<!-- SELECT FILE_type from sar_stand_items WHERE STAND_ID = #{standId} GROUP BY FILE_TYPE -->
|
||||
SELECT FILE_type from sar_file_split_info WHERE STAND_ID = #{standId} AND VALID_FLAG = '0' GROUP BY FILE_TYPE
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
||||
Reference in New Issue
Block a user