|
@@ -79,7 +79,6 @@ public class WbsTreeContractController extends BladeController {
|
|
|
|
|
|
private final JdbcTemplate jdbcTemplate;
|
|
|
private final IWbsTreeContractService iWbsTreeContractService;
|
|
|
- private final IWbsTreePrivateService iWbsTreePrivateService;
|
|
|
private final WbsTreeContractServiceImpl wbsTreeContractServiceImpl;
|
|
|
private final ContractClient contractClient;
|
|
|
private final IWbsParamService iWbsParamService;
|
|
@@ -88,8 +87,6 @@ public class WbsTreeContractController extends BladeController {
|
|
|
|
|
|
private final ExcelTabController excelTabController;
|
|
|
|
|
|
- private final INodeBaseInfoService nodeBaseInfoService;
|
|
|
-
|
|
|
|
|
|
@GetMapping("/diGuiWbs")
|
|
|
@ApiOperationSupport(order = 1)
|
|
@@ -166,37 +163,15 @@ public class WbsTreeContractController extends BladeController {
|
|
|
@ApiOperationSupport(order = 32)
|
|
|
@ApiOperation(value = "节点配置根据选择的文件题名规则获取文件题名", notes = "传入规则和节点pkeyId")
|
|
|
public R getNameRuleByRule(@RequestParam String nameRule,@RequestParam Long pkeyId){
|
|
|
- NodeBaseInfo nodeBaseInfo = nodeBaseInfoService.getBaseMapper().selectOne(new QueryWrapper<NodeBaseInfo>().eq("node_id", pkeyId));
|
|
|
- if(nodeBaseInfo==null){
|
|
|
- nodeBaseInfo = nodeBaseInfoService.getOrSaveNodeBaseInfo(pkeyId);
|
|
|
- }
|
|
|
String[] codes = nameRule.split("-");
|
|
|
Arrays.sort(codes, Comparator.comparingInt(s -> Integer.parseInt(s.substring(1))));
|
|
|
- StringBuilder result = new StringBuilder();
|
|
|
- for (int i = 0; i < codes.length; i++) {
|
|
|
- if(codes[i].equals("C0")){
|
|
|
- result.append(nodeBaseInfo.getUnit());
|
|
|
- } else if (codes[i].equals("C1")) {
|
|
|
- result.append(nodeBaseInfo.getSubUnit());
|
|
|
- }else if (codes[i].equals("C2")) {
|
|
|
- result.append(nodeBaseInfo.getDivision());
|
|
|
- }else if (codes[i].equals("C3")) {
|
|
|
- result.append(nodeBaseInfo.getSubDivision());
|
|
|
- }else if (codes[i].equals("C4")) {
|
|
|
- result.append(nodeBaseInfo.getItem());
|
|
|
- }else if (codes[i].equals("C5")) {
|
|
|
- result.append(nodeBaseInfo.getSubItem());
|
|
|
- }else if (codes[i].equals("C6")) {
|
|
|
- result.append(nodeBaseInfo.getProcesses());
|
|
|
- }
|
|
|
- }
|
|
|
-// nameRule= String.join("-", codes);
|
|
|
-// String sql="Select * from m_wbs_tree_contract where p_key_id="+pkeyId;
|
|
|
-// WbsTreeContract contract = jdbcTemplate.queryForObject(sql, new BeanPropertyRowMapper<>(WbsTreeContract.class));
|
|
|
-// String result = iWbsParamService.createFileTitle1(contract, nameRule);
|
|
|
-// RandomNumberHolder.RandomTemplateTypeclear();
|
|
|
-// RandomNumberHolder.RandomWbsTreeContractclear();
|
|
|
- return R.data(result.toString());
|
|
|
+ nameRule= String.join("-", codes);
|
|
|
+ String sql="Select * from m_wbs_tree_contract where p_key_id="+pkeyId;
|
|
|
+ WbsTreeContract contract = jdbcTemplate.queryForObject(sql, new BeanPropertyRowMapper<>(WbsTreeContract.class));
|
|
|
+ String result = iWbsParamService.createFileTitle1(contract, nameRule);
|
|
|
+ RandomNumberHolder.RandomTemplateTypeclear();
|
|
|
+ RandomNumberHolder.RandomWbsTreeContractclear();
|
|
|
+ return R.data(result);
|
|
|
}
|
|
|
//节点命名配置
|
|
|
@GetMapping("/saveContractNameRule")
|