gong
2024-06-17 b8e67d5748a18e7e29d2ed1891f9c709a6d7cb3a
加个异步处理 测试出的问题
3 files modified
12 ■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.java 2 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.xml 4 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java 6 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.java
@@ -28,5 +28,5 @@
     * @param deviceId
     * @return
     */
    List<SgDeviceGxStepDO> getDeviceGXList(@Param("gxInfoId") Long deviceId);
    List<SgDeviceGxStepDO> getDeviceGXList(@Param("deviceId") Long deviceId);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.xml
@@ -23,9 +23,9 @@
        left join  YWXT.SG_GX_STEP step on sg.id=step.gx_info_id
        where sd.id= = #{deviceId}
        where sd.id= #{deviceId}
        ) info left join YWXT.SG_PROGRESS_REPORT sp on info.gxDeviceId=sp.PROFRAM_ID and info.gxId=sp.GX_STEP_ID
        ) info left join YWXT.SG_PROGRESS_REPORT sp on info.gxDeviceId= sp.gx_device_id and info.gxId = sp.GX_STEP_ID
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
@@ -71,7 +71,7 @@
        Long gxDeviceId = sgProgressReportDO.getGxDeviceId();
        Long gxStepId = sgProgressReportDO.getGxStepId();
        List<SgGxStepDO> list = sgGxStepMapper.selectByGxInfoId(gxDeviceId);
        SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxDeviceId);
        SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxStepId);
        for (SgGxStepDO gxStepDO : list) {
            if (Integer.parseInt(sgGxStepDO.getGxStepNum()) - Integer.parseInt(gxStepDO.getGxStepNum()) == 1) {
                LambdaQueryChainWrapper<SgProgressReportDO> wrapper = new LambdaQueryChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getGxStepId, gxStepDO.getId());
@@ -110,7 +110,7 @@
        }
        SgProjectInfoDO sgProjectInfoDO = sgProjectInfoMapper.selectById(sgProgressReportDO.getProframId());
        if (sgProjectInfoDO != null && sgProjectInfoDO.getStatus() == 0) {
            sgDeviceDO.setStatus(1);
            sgProjectInfoDO.setStatus(1);
            sgProjectInfoMapper.updateById(sgProjectInfoDO);
        }
    }
@@ -214,7 +214,7 @@
                    }
                    int size = sgDeviceGxStepDOs.size();
                    if((size*2)/countStatus==1){
                    if(countStatus!=0&&(size*2)/countStatus==1){
                        //如果设备下全部工序审核完成
                        sgDeviceDO.setStatus(2);
                        sgDeviceMapper.updateById(sgDeviceDO);