xiejun
2023-06-07 20633c4c46b1b0498fb5ca36d3a731eaa5b99c54
集团申请单接口增加
已修改5个文件
已添加1个文件
149 ■■■■■ 文件已修改
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/feign/MdmApplyGroupCodeProvider.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingApplyFormQueryStatusVO.java 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IGroupMdmInterService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreAttrMappingMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/feign/MdmApplyGroupCodeProvider.java
@@ -60,6 +60,6 @@
     * @return æ‰§è¡Œç»“æžœ
     */
    @PostMapping("/externalMainData/queryApplyState")
    DockingApplyFormStatusVO queryApplyState(@NotNull @RequestBody DockingModelQueryVO dockingModelQueryVO);
    DockingApplyFormQueryStatusVO queryApplyState(@NotNull @RequestBody DockingModelQueryVO dockingModelQueryVO);
}
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingApplyFormQueryStatusVO.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,51 @@
package com.vci.ubcs.code.webservice.vo;
import java.util.List;
public class DockingApplyFormQueryStatusVO {
    /***
     * æŽ¥å£ç¼–码
     */
    private int code;
    /***
     * è¿”回消息
     */
    private String msg;
    /****
     * è¿”回申请单状态
     */
    private List<DockingApplyFormStatusVO> data;
    public int getCode() {
        return code;
    }
    public void setCode(int code) {
        this.code = code;
    }
    public String getMsg() {
        return msg;
    }
    public void setMsg(String msg) {
        this.msg = msg;
    }
    public List<DockingApplyFormStatusVO> getData() {
        return data;
    }
    public void setData(List<DockingApplyFormStatusVO> data) {
        this.data = data;
    }
    @Override
    public String toString() {
        return "DockingApplyFormQueryStatusVO{" +
            "code=" + code +
            ", msg='" + msg + '\'' +
            ", data=" + data +
            '}';
    }
}
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
@@ -206,4 +206,19 @@
    }
/***
 * æŸ¥è¯¢ç”³è¯·å•状态
 * oids:业务数据oid
 * @return è¿”回执行结果信息
 */
    @GetMapping( "/queryApplyState")
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "查看申请单状态", notes = "查看申请单状态")
    public R  queryApplyState(String oids){
        try {
            return groupMdmInterService.queryApplyState(oids);
        }catch (VciBaseException e){
            return R.fail("同步集团模型视图失败:"+e.getMessage());
        }
    }
}
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IGroupMdmInterService.java
@@ -50,4 +50,12 @@
     * @return
     */
    R syncClassifyModel(String classifyId, String operationType)throws VciBaseException;
    /***
     * æŸ¥è¯¢çŠ¶æ€
     * @param oids
     * @return
     * @throws VciBaseException
     */
    R queryApplyState(String oids)throws VciBaseException;
}
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java
@@ -438,7 +438,7 @@
                    throw new Throwable(message);
                }
            }else{
                message="未获从集团获取到任何模型信息";
                message="未从集团获取到任何模型信息";
                log.info(message);
                throw new Throwable(message);
            }
@@ -459,24 +459,57 @@
     * @param dataOids
     * @return æ‰§è¡Œç»“æžœ
     */
    public R queryApplyState(String dataOids) {
    @Override
    public R queryApplyState(String dataOids) throws VciBaseException {
        String message="执行成功!";
        log.info("查询申请单状态接口statr");
        try {
            VciBaseUtil.alertNotNull(dataOids,"所查申请单数据主键");
            VciBaseUtil.alertNotNull(dockingApplySysName,"系统标识配置:docking.apply.unitCode");
            List<String> applyIdList=new ArrayList<>();
            List<DockingPreApplyForm> dockingPreApplyFormList=    this.dockingPreApplyFormService.list(Wrappers.<DockingPreApplyForm>query().lambda().in(DockingPreApplyForm::getDataOid, VciBaseUtil.str2List(dataOids)));
            Map<String,DockingPreApplyForm> dockingPreApplyFormMap=new HashMap<>();
            dockingPreApplyFormList.stream().forEach(dockingPreApplyForm -> {
                dockingPreApplyForm.getId();
                applyIdList.add(dockingPreApplyForm.getId());
                dockingPreApplyFormMap.put(dockingPreApplyForm.getId(),dockingPreApplyForm);
            });
            DockingModelQueryVO dockingModelQueryVO=new DockingModelQueryVO();
            dockingModelQueryVO.setApplyNums(VciBaseUtil.array2String(applyIdList.toArray(new String[]{})));
            dockingModelQueryVO.setSysName(dockingApplySysName);
            DockingApplyFormQueryStatusVO dockingApplyFormQueryStatusVO=mdmApplyGroupCodeProvider.queryApplyState(dockingModelQueryVO);
            int code=dockingApplyFormQueryStatusVO.getCode();
            String mesg=dockingApplyFormQueryStatusVO.getMsg();
            if(code==1){
                List<DockingApplyFormStatusVO> dockingApplyFormStatusVOList=dockingApplyFormQueryStatusVO.getData();
                if(CollectionUtils.isEmpty(dockingApplyFormStatusVOList)){
                    for (DockingApplyFormStatusVO applyFormDataState : dockingApplyFormStatusVOList) {
                        String applyId=applyFormDataState.getApplyNum();
                        String state= applyFormDataState.getFormState();
                        String examineOpinion=applyFormDataState.getExamineOpinion();
                        String jmsg=getCodeState(state)+",意见:"+examineOpinion;
                        if(dockingPreApplyFormMap.containsKey(applyId)){
                            DockingPreApplyForm applyFormObject=dockingPreApplyFormMap.get(applyId);
                            applyFormObject.setMsg(jmsg);
                        }
                    }
                    boolean res=this.dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
                    if(res){
                        R.success("申请集团码状态查询成功:"+mesg);
                    }
                }else{
                    throw new Throwable("没有获取到相关数据信息");
                }
            }else{
                throw new    Throwable(mesg);
            }
        }catch (Throwable e){
            e.printStackTrace();;
            log.error("获取数据模型失败"+e);
            R.fail(message);
            log.error("获取申请单状态失败"+e);
            throw  new VciBaseException(message);
        }
        log.info("查询申请单状态接口end");
        return R.success(message);
@@ -968,4 +1001,28 @@
        }
        return value;
    }
    private String getCodeState(String formState){
        String msg="";
        if("1".equals(formState)){
            msg="集团审核中";
        }else if("2".equals(formState)){
            msg="驳回";
        }else if("3".equals(formState)){
            msg="集团审核中";
        }else if("4".equals(formState)){
            msg="审核结束,赋码失败";
        }else if("5".equals(formState)){
            msg="审核结束,赋码成功";
        }else if("6".equals(formState)){
            msg="待301赋码";
        }else if("7".equals(formState)){
            msg="已赋码";
        }else if("8".equals(formState)){
            msg="已赋码(沿用)";
        }else if("9".equals(formState)){
            msg="审核中";
        }
        return msg;
    }
}
Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreAttrMappingMapper.xml
@@ -35,7 +35,7 @@
            <result column="SOURCECLSFNAME" property="sourceClassifyName"/>
            <result column="TARGETATTRID" property="targetAttrId"/>
            <result column="TARGETCLSFID" property="targetClassifyId"/>
            <result column="VIEWMODEID" property="viewModeId"/>
           <!-- <result column="VIEWMODEID" property="viewModeId"/>-->
            <result column="VIEWMODENAME" property="viewModelName"/>
            <result column="TARGETATTRKEY" property="targetAttrKey"/>
            <result column="TARGETATTRNAME" property="targetAttrName"/>