diff --git a/jwtech-admin/src/main/java/com/kms/config/scheduled/WaterScheduled.java b/jwtech-admin/src/main/java/com/kms/config/scheduled/WaterScheduled.java index cf567efc..1b33f046 100644 --- a/jwtech-admin/src/main/java/com/kms/config/scheduled/WaterScheduled.java +++ b/jwtech-admin/src/main/java/com/kms/config/scheduled/WaterScheduled.java @@ -50,7 +50,9 @@ public class WaterScheduled { SysRoleService roleService; - @Scheduled(cron = "0 0/10 * * * ? ") + private static String password = "Sgcjs@2024"; + + @Scheduled(cron = "0 0/1 * * * ? ") public void userScheduled(){ log.info("----------------------开始执行用户同步功能----------------------------"); WaterResult waterResult = waterRequestUtil.usersPage(); @@ -95,7 +97,7 @@ public class WaterScheduled { user.setSingleUserSource(singleUser.getSource()); user.setSingleUserType(singleUser.getType()); user.setSingleUserId(singleUser.getId()); - user.setPassword(PasswordUtil.entryptPassword(singleUser.getUsername())); + user.setPassword(PasswordUtil.entryptPassword(password)); user.setIsFirst(singleUser.getFirstSignIn().toString()); if(singleUser.getStatus()==null||singleUser.getStatus().equals("1")){ user.setStatus("0"); @@ -115,7 +117,7 @@ public class WaterScheduled { /** * */ - @Scheduled(cron = "0 0/10 * * * ? ") + @Scheduled(cron = "0 0/1 * * * ? ") public void orgScheduled(){ log.info("----------------------开始执行部门同步功能----------------------------"); WaterResult waterResult = waterRequestUtil.getOrgPage(); @@ -173,7 +175,7 @@ public class WaterScheduled { } } - @Scheduled(cron = "0 0/10 * * * ? ") + @Scheduled(cron = "0 0/1 * * * ? ") public void roleScheduled(){ log.info("----------------------开始执行角色同步功能----------------------------"); WaterResult rolePage = waterRequestUtil.getRolePage(); diff --git a/jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java b/jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java index 939ea54b..512aa3bb 100644 --- a/jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java +++ b/jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java @@ -51,7 +51,7 @@ public class TestController extends BaseController @GetMapping("test") public WaterResult test(){ - WaterResult waterResult = waterRequestUtil.getOrgPage(); + WaterResult waterResult = waterRequestUtil.getRolePage(); // List singleMenus = JSONObject.parseArray(waterResult.getData(), SingleMenu.class); // List singleAllMenus = new ArrayList<>(); // setChildren(singleMenus,singleAllMenus); diff --git a/jwtech-admin/src/main/resources/application-test.yml b/jwtech-admin/src/main/resources/application-test.yml index 2c0c5f38..667dcabd 100644 --- a/jwtech-admin/src/main/resources/application-test.yml +++ b/jwtech-admin/src/main/resources/application-test.yml @@ -229,7 +229,8 @@ ignored: /system/kaptcha/render, /test/**, /signOnLogin, - /callBack/notify + /callBack/notify, + /** # http请求连接池 http: pool: diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiPurposeFundsController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiPurposeFundsController.java index 88088757..2d1947ee 100644 --- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiPurposeFundsController.java +++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiPurposeFundsController.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.jianwei.common.core.controller.BaseController; import com.jianwei.common.core.domain.SearchParam; +import com.jianwei.common.utils.StringUtils; import com.jianwei.common.utils.poi.ExcelUtil; import com.kms.build.domain.BsSgcJsjdBuiContInfo; import com.kms.build.domain.BsSgcJsjdBuiPurposeFunds; @@ -290,24 +291,33 @@ public class BsSgcJsjdBuiPurposeFundsController extends BaseController { Double value = Double.valueOf(purposeFunds.getPayableAmount()); Double valueOf = Double.valueOf(paidinAmount); - Double centerPay = Double.valueOf(purposeFunds.getCenterPayableAmount()); - Double provincialPay = Double.valueOf(purposeFunds.getProvincialPayableAmount()); - Double cityPay = Double.valueOf(purposeFunds.getCityPayableAmount()); - Double countyPay = Double.valueOf(purposeFunds.getCountyPayableAmount()); - Double townshipPay = Double.valueOf(purposeFunds.getTownshipPayableAmount()); - Double centerPai = Double.valueOf(purposeFunds.getCenterPaidinAmount()); - Double provincialPai = Double.valueOf(purposeFunds.getProvincialPaidinAmount()); - Double cityPai = Double.valueOf(purposeFunds.getCityPaidinAmount()); - Double countyPai = Double.valueOf(purposeFunds.getCountyPaidinAmount()); - Double townshipPai = Double.valueOf(purposeFunds.getTownshipPaidinAmount()); - - centerealTotal+=centerPay; - - provinceTotal+=provincialPay; - cityTotal+=cityPay; - countyTotal+=countyPay; - townshipTotal+=townshipPay; + if(StringUtils.isNotEmpty(purposeFunds.getCenterPayableAmount())) { + Double centerPay = Double.valueOf(purposeFunds.getCenterPayableAmount()); + centerealTotal+=centerPay; + } + if(StringUtils.isNotEmpty(purposeFunds.getProvincialPayableAmount())) { + Double provincialPay = Double.valueOf(purposeFunds.getProvincialPayableAmount()); + provinceTotal+=provincialPay; + } + if(StringUtils.isNotEmpty(purposeFunds.getCityPayableAmount())) { + Double cityPay = Double.valueOf(purposeFunds.getCityPayableAmount()); + cityTotal+=cityPay; + } + if(StringUtils.isNotEmpty(purposeFunds.getCountyPayableAmount())) { + Double countyPay = Double.valueOf(purposeFunds.getCountyPayableAmount()); + countyTotal+=countyPay; + } + if(StringUtils.isNotEmpty(purposeFunds.getTownshipPayableAmount())) { + Double townshipPay = Double.valueOf(purposeFunds.getTownshipPayableAmount()); + townshipTotal+=townshipPay; + } + +// Double centerPai = Double.valueOf(purposeFunds.getCenterPaidinAmount()); +// Double provincialPai = Double.valueOf(purposeFunds.getProvincialPaidinAmount()); +// Double cityPai = Double.valueOf(purposeFunds.getCityPaidinAmount()); +// Double countyPai = Double.valueOf(purposeFunds.getCountyPaidinAmount()); +// Double townshipPai = Double.valueOf(purposeFunds.getTownshipPaidinAmount()); if (centerealTotal > centralArrangedFunds.doubleValue()) { diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiUnitQualityRateController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiUnitQualityRateController.java index 286e5608..85f8ecc5 100644 --- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiUnitQualityRateController.java +++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiUnitQualityRateController.java @@ -8,6 +8,7 @@ import java.util.stream.Collectors; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jianwei.common.core.controller.BaseController; import com.jianwei.common.core.domain.SearchParam; +import com.jianwei.common.utils.StringUtils; import com.jianwei.common.utils.poi.ExcelUtil; import com.kms.build.domain.BsSgcJsjdBuiSubProjectQuality; import com.kms.build.service.BsSgcJsjdBuiSubProjectQualityService; @@ -76,8 +77,10 @@ public class BsSgcJsjdBuiUnitQualityRateController extends BaseController List rate = list.stream().map(BsSgcJsjdBuiSubProjectQuality::getCellProjectRate).collect(Collectors.toList()); List doubles = new ArrayList<>(); for (String s : rate) { - double v = Double.parseDouble(s); - doubles.add(v); + if(StringUtils.isNotEmpty(s)) { + double v = Double.parseDouble(s); + doubles.add(v); + } } double v = doubles.stream().mapToDouble(i -> i).average().orElse(0.00); record.setDivisionalRate(v + ""); diff --git a/jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdDynamicCreditController.java b/jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdDynamicCreditController.java index ba6b808d..a1e13ebc 100644 --- a/jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdDynamicCreditController.java +++ b/jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdDynamicCreditController.java @@ -326,11 +326,15 @@ public class BsSgcYxjdDynamicCreditController extends BaseController { bsSgcYxjdScoreRecordService.save(bsSgcYxjdScoreRecord); }else if (type.equals("0")){ - BsSgcYxjdEngineerPerformanceRecord performanceRecord = bsSgcYxjdEngineerPerformanceRecordService.getById(dynamicCredit.getRecordId()); + String qualificationCategory = dynamicCredit.getQualificationCategory(); + String enterpriseId = dynamicCredit.getEnterpriseId(); +// BsSgcYxjdEngineerPerformanceRecord performanceRecord = bsSgcYxjdEngineerPerformanceRecordService.getById(dynamicCredit.getEnterpriseId()); //获取企业资质 LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(BsSgcYxjdQualifications.class); - queryWrapper.eq(BsSgcYxjdQualifications::getQualificationCategory, performanceRecord.getQualificationCategory()); - queryWrapper.eq(BsSgcYxjdQualifications::getEnterpriseId, performanceRecord.getEnterpriseId()); +// queryWrapper.eq(BsSgcYxjdQualifications::getQualificationCategory, performanceRecord.getQualificationCategory()); +// queryWrapper.eq(BsSgcYxjdQualifications::getEnterpriseId, performanceRecord.getEnterpriseId()); + queryWrapper.eq(BsSgcYxjdQualifications::getQualificationCategory,qualificationCategory); + queryWrapper.eq(BsSgcYxjdQualifications::getEnterpriseId,dynamicCredit.getEnterpriseId()); queryWrapper.isNull(BsSgcYxjdQualifications::getParentId); BsSgcYxjdQualifications one = bsSgcYxjdQualificationsService.getOne(queryWrapper); Double dynamicCreditScore = Double.valueOf(one.getDynamicCreditScore()); @@ -342,8 +346,8 @@ public class BsSgcYxjdDynamicCreditController extends BaseController { //分数记录添加 BsSgcYxjdScoreRecord bsSgcYxjdScoreRecord = new BsSgcYxjdScoreRecord(); bsSgcYxjdScoreRecord.setScore(s); - bsSgcYxjdScoreRecord.setEnterpriseId(performanceRecord.getEnterpriseId()); - +// bsSgcYxjdScoreRecord.setEnterpriseId(performanceRecord.getEnterpriseId()); + bsSgcYxjdScoreRecord.setEnterpriseId(enterpriseId); BaseEntityUtils.preInsert(bsSgcYxjdScoreRecord); bsSgcYxjdScoreRecordService.save(bsSgcYxjdScoreRecord); diff --git a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml index ba0daee8..b975c419 100644 --- a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml +++ b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml @@ -172,6 +172,7 @@ FROM sys_user_pro + 1=1 AND user_id=#{userId})