Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyProcessTempController.java

@@ -16,8 +16,10 @@
import lombok.AllArgsConstructor;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cglib.beans.BeanMap;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.util.*;
import java.util.stream.Collectors;

@@ -50,7 +52,7 @@
        if(baseQueryObject == null){
            baseQueryObject = new BaseQueryObject();
        }
        return R.data(codeClassifyProcessTempService.gridCodeClassifyProcessTemp(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper()));
      return R.data(codeClassifyProcessTempService.gridCodeClassifyProcessTemp(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper()));
    }

    /**
@@ -81,7 +83,7 @@
     * @return 删除结果反馈：：success：成功，fail：失败
     */
    @DeleteMapping( "/deleteData")
    public R delCodeClassifyProcessTemp(CodeClassifyProcessTempDTO codeClassifyProcessTempDTO) {
    public R delCodeClassifyProcessTemp(@Valid @RequestBody CodeClassifyProcessTempDTO codeClassifyProcessTempDTO) {
        return codeClassifyProcessTempService.deleteCodeClassifyProcessTemp(codeClassifyProcessTempDTO);
    }

@@ -141,11 +143,12 @@
    @GetMapping("/listSameProcessTemplate")
    public R<CodeClassifyProcessTempVO> listSameProcessTemplate(String codeTemplateOid,String processUse){
        VciBaseUtil.alertNotNull(codeTemplateOid,"所选择的数据模板主键");
      String s3 = VciBaseUtil.toInSql(codeTemplateOid);
        /*Map<String,String> conditionMap=new HashMap<>();
        conditionMap.put("classifyTemplateOid", QueryOptionConstant.IN  + VciBaseUtil.toInSql(codeTemplateOid));
        conditionMap.put("codeprocessuse",processUse);*/
      LambdaQueryWrapper<CodeClassifyProcessTemp> LambdaQueryWrapper = Wrappers.<CodeClassifyProcessTemp>query()
         .lambda().in(CodeClassifyProcessTemp::getCodeClassifyOid, VciBaseUtil.toInSql(codeTemplateOid))
         .lambda().in(CodeClassifyProcessTemp::getClassifyTemplateOid, codeTemplateOid.split(","))
         .eq(CodeClassifyProcessTemp::getCodeProcessUse, processUse);

      List<CodeClassifyProcessTempVO> codeClassifyProcessTempVOS = codeClassifyProcessTempService.selectByWrapper(LambdaQueryWrapper);