From a421bb324c23aecd74c70eb968cc6babcb5e8a6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Tue, 24 Feb 2026 20:18:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/YanZhuManageApplication.java | 2 - .../manage/controller/TestBsController.java | 283 ------------------ ...roProjectInfoSubdeptsUsersServiceImpl.java | 39 ++- .../project_flowable/approveTask/index.wxml | 6 + .../project_flowable/detailTask/index.wxml | 6 + .../project_flowable/subDepts/index.wxml | 1 - .../miniprogram/pages/project_qr/index.js | 23 ++ .../miniprogram/pages/project_qr/index.wxml | 6 + .../task/myProcess/detail/indexDrawer.vue | 3 + .../flowable/task/todo/detail/indexDrawer.vue | 3 + 10 files changed, 76 insertions(+), 296 deletions(-) delete mode 100644 yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/TestBsController.java diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/YanZhuManageApplication.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/YanZhuManageApplication.java index e85e71f5..d09f5fc2 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/YanZhuManageApplication.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/YanZhuManageApplication.java @@ -1,6 +1,5 @@ package com.yanzhu.manage; -import com.yanzhu.common.core.utils.reflect.ReflectUtils; import com.yanzhu.common.security.annotation.EnableCustomConfig; import com.yanzhu.common.security.annotation.EnableRyFeignClients; import com.yanzhu.common.swagger.annotation.EnableCustomSwagger2; @@ -9,7 +8,6 @@ import net.hasor.spring.boot.EnableHasor; import net.hasor.spring.boot.EnableHasorWeb; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.ApplicationContext; diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/TestBsController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/TestBsController.java deleted file mode 100644 index 831e2342..00000000 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/TestBsController.java +++ /dev/null @@ -1,283 +0,0 @@ -package com.yanzhu.manage.controller; - -import com.alibaba.fastjson2.JSON; -import com.yanzhu.common.core.web.domain.AjaxResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 大屏控制器 - * JiangYuQi - */ -@RestController -@RequestMapping("/testBs") -public class TestBsController { - - private String unit = "吨"; - - private BigDecimal perfect = new BigDecimal(100); - - /** - * 获取本月原料到货总量 - * @param date - * @return AjaxResult - * { - * "code": 200, - * "data": { - * "total": 2038, - * "unit": "吨", - * "sources": [ - * { "name": "大庆西姆莱斯", "value": 131 }, - * { "name": "林州风宝", "value": 6345 }, - * { "name": "延安嘉盛", "value": 250 }, - * { "name": "通钢磐石", "value": 742 }, - * { "name": "包钢销售", "value": 4165 }, - * { "name": "林州凤宝M", "value": 675 } - * ] - * }, - * "message": "success" - * } - */ - @GetMapping("/raw-material/arrival") - public AjaxResult getArrivalData(@RequestParam(required = false) String date) { - return AjaxResult.success(JSON.parseObject("{\"unit\":\"吨\",\"total\":7032.785,\"list\":[{\"total\":1949.72,\"ZYLSupCmp_ID\":\"10010002\",\"ZYLSupCmp\":\"包钢销售\"},{\"total\":294.275,\"ZYLSupCmp_ID\":\"10010005\",\"ZYLSupCmp\":\"通钢磐石\"},{\"total\":3755.765,\"ZYLSupCmp_ID\":\"10010039\",\"ZYLSupCmp\":\"林州风宝\"},{\"total\":1033.025,\"ZYLSupCmp_ID\":\"10020024\",\"ZYLSupCmp\":\"林州凤宝M\"}]}")); - } - - /** - * 获取本月产品出库总量及各采油厂明细 - * @param date - * @return AjaxResult - * { - * "code": 200, - * "data": { - * "total": 2038, - * "unit": "吨", - * "plants": [ - * { "name": "吴起采油厂", "value": 934 }, - * { "name": "子长采油厂", "value": 608 }, - * { "name": "富县采油厂", "value": 789 }, - * { "name": "定边采油厂", "value": 445 }, - * { "name": "杏子川采油厂", "value": 185 }, - * { "name": "南泥湾采油厂", "value": 45 } - * ] - * }, - * "message": "success" - * } - */ - @GetMapping("/product/outbound") - public AjaxResult getOutboundData(@RequestParam(required = false) String date) { - return AjaxResult.success(JSON.parseObject("{\"unit\":\"吨\",\"total\":2925.630,\"list\":[{\"totalNumber\":23781,\"totalRate\":1423,\"ZCp_OrderGdCmp_ID\":\"10210001\",\"BcOrderGdCmp\":\"吴起采油厂\",\"totalWeight\":2631.110,\"totalLength\":229871.47},{\"totalNumber\":342,\"totalRate\":18,\"ZCp_OrderGdCmp_ID\":\"10210004\",\"BcOrderGdCmp\":\"子长采油厂\",\"totalWeight\":33.041,\"totalLength\":3286.87},{\"totalNumber\":840,\"totalRate\":120,\"ZCp_OrderGdCmp_ID\":\"10210023\",\"BcOrderGdCmp\":\"南泥湾采油厂\",\"totalWeight\":261.479,\"totalLength\":8584.08}]}")); - } - - /** - * 获取各分厂本月入库达成率列表 - * @param date - * @return AjaxResult - * { - * "code": 200, - * "data": { - * "total": 2038, - * "unit": "吨", - * "plants": [ - * { "name": "一分厂", "completionRate": 78 }, - * { "name": "二分厂", "completionRate": 66 }, - * { "name": "三分厂", "completionRate": 73 } - * ] - * }, - * "message": "success" - * } - */ - @GetMapping("/plant/inbound/completion-rate") - public AjaxResult getCompletionRate(@RequestParam(required = false) String date) { - return AjaxResult.success(JSON.parseObject("{\"unit\":\"吨\",\"total\":10958.58300,\"factory2\":{\"totalNumber\":12905,\"ZCpProdCmp_ID\":\"4\",\"ZCpProdCmp_NAME\":\"二分厂\",\"totalWeight\":3652.86100,\"totalPlan\":3800.0,\"totalLength\":132125.49,\"ratio\":100.0},\"factory3\":{\"totalNumber\":12905,\"ZCpProdCmp_ID\":\"7\",\"ZCpProdCmp_NAME\":\"三分厂\",\"totalWeight\":3652.86100,\"totalPlan\":3800.0,\"totalLength\":132125.49,\"ratio\":100.0},\"factory1\":{\"totalNumber\":12905,\"ZCpProdCmp_ID\":\"3\",\"ZCpProdCmp_NAME\":\"一分厂\",\"totalWeight\":3652.86100,\"totalPlan\":3800.0,\"totalLength\":132125.49,\"ratio\":100.0}}")); - } - - /** - * 获取指定分厂的详细入库数据 - * @return AjaxResult - * { - * "code": 200, - * "data": { - * "plant": "一分厂", - * "total": 800, - * "unit": "吨", - * "dailyData": [ - * { "date": "2025-12-01", "amount": 50 }, - * { "date": "2025-12-02", "amount": 45 }, - * // ... 其他天数据 - * ], - * "products": [ - * { "name": "油管J55", "amount": 300 }, - * { "name": "套管N80Q", "amount": 200 }, - * { "name": "内涂层油管", "amount": 300 } - * ] - * }, - * "message": "success" - * } - */ - @GetMapping("/plant/inbound/detail") - public AjaxResult getInboundDetail() { - return AjaxResult.success(JSON.parseObject("{\"unit\":\"吨\",\"list\":[{\"totalNumber\":560,\"dateStr\":\"2025-12-25\",\"ZCpProdCmp_ID\":\"3\",\"ZCpProdCmp_NAME\":\"一分厂\",\"totalWeight\":149.35300,\"totalLength\":5784.09,\"weekStr\":\"五\"},{\"totalNumber\":308,\"dateStr\":\"2025-12-25\",\"ZCpProdCmp_ID\":\"4\",\"ZCpProdCmp_NAME\":\"二分厂\",\"totalWeight\":83.64700,\"totalLength\":3162.17,\"weekStr\":\"五\"},{\"totalNumber\":456,\"dateStr\":\"2025-12-25\",\"ZCpProdCmp_ID\":\"7\",\"ZCpProdCmp_NAME\":\"三分厂\",\"totalWeight\":43.99400,\"totalLength\":4379.20,\"weekStr\":\"五\"},{\"totalNumber\":560,\"dateStr\":\"2025-12-24\",\"ZCpProdCmp_ID\":\"3\",\"ZCpProdCmp_NAME\":\"一分厂\",\"totalWeight\":149.88600,\"totalLength\":5745.50,\"weekStr\":\"四\"},{\"totalNumber\":616,\"dateStr\":\"2025-12-24\",\"ZCpProdCmp_ID\":\"4\",\"ZCpProdCmp_NAME\":\"二分厂\",\"totalWeight\":166.47600,\"totalLength\":6312.33,\"weekStr\":\"四\"},{\"totalNumber\":456,\"dateStr\":\"2025-12-24\",\"ZCpProdCmp_ID\":\"7\",\"ZCpProdCmp_NAME\":\"三分厂\",\"totalWeight\":43.98100,\"totalLength\":4378.68,\"weekStr\":\"四\"},{\"totalNumber\":0,\"dateStr\":\"2025-12-23\",\"ZCpProdCmp_ID\":\"3\",\"ZCpProdCmp_NAME\":\"一分厂\",\"totalWeight\":0,\"totalLength\":0,\"weekStr\":\"三\"},{\"totalNumber\":308,\"dateStr\":\"2025-12-23\",\"ZCpProdCmp_ID\":\"4\",\"ZCpProdCmp_NAME\":\"二分厂\",\"totalWeight\":83.72700,\"totalLength\":3159.51,\"weekStr\":\"三\"},{\"totalNumber\":456,\"dateStr\":\"2025-12-23\",\"ZCpProdCmp_ID\":\"7\",\"ZCpProdCmp_NAME\":\"三分厂\",\"totalWeight\":43.99600,\"totalLength\":4379.34,\"weekStr\":\"三\"},{\"totalNumber\":210,\"dateStr\":\"2025-12-22\",\"ZCpProdCmp_ID\":\"3\",\"ZCpProdCmp_NAME\":\"一分厂\",\"totalWeight\":55.99600,\"totalLength\":2159.54,\"weekStr\":\"二\"},{\"totalNumber\":616,\"dateStr\":\"2025-12-22\",\"ZCpProdCmp_ID\":\"4\",\"ZCpProdCmp_NAME\":\"二分厂\",\"totalWeight\":166.60300,\"totalLength\":6312.97,\"weekStr\":\"二\"},{\"totalNumber\":456,\"dateStr\":\"2025-12-22\",\"ZCpProdCmp_ID\":\"7\",\"ZCpProdCmp_NAME\":\"三分厂\",\"totalWeight\":43.97600,\"totalLength\":4378.53,\"weekStr\":\"二\"},{\"totalNumber\":354,\"dateStr\":\"2025-12-21\",\"ZCpProdCmp_ID\":\"3\",\"ZCpProdCmp_NAME\":\"一分厂\",\"totalWeight\":94.42400,\"totalLength\":3635.58,\"weekStr\":\"一\"},{\"totalNumber\":308,\"dateStr\":\"2025-12-21\",\"ZCpProdCmp_ID\":\"4\",\"ZCpProdCmp_NAME\":\"二分厂\",\"totalWeight\":83.36700,\"totalLength\":3160.60,\"weekStr\":\"一\"},{\"totalNumber\":456,\"dateStr\":\"2025-12-21\",\"ZCpProdCmp_ID\":\"7\",\"ZCpProdCmp_NAME\":\"三分厂\",\"totalWeight\":43.97900,\"totalLength\":4378.40,\"weekStr\":\"一\"},{\"totalNumber\":560,\"dateStr\":\"2025-12-20\",\"ZCpProdCmp_ID\":\"3\",\"ZCpProdCmp_NAME\":\"一分厂\",\"totalWeight\":149.36000,\"totalLength\":5757.52,\"weekStr\":\"日\"},{\"totalNumber\":616,\"dateStr\":\"2025-12-20\",\"ZCpProdCmp_ID\":\"4\",\"ZCpProdCmp_NAME\":\"二分厂\",\"totalWeight\":167.26500,\"totalLength\":6321.21,\"weekStr\":\"日\"},{\"totalNumber\":456,\"dateStr\":\"2025-12-20\",\"ZCpProdCmp_ID\":\"7\",\"ZCpProdCmp_NAME\":\"三分厂\",\"totalWeight\":43.99300,\"totalLength\":4379.38,\"weekStr\":\"日\"},{\"totalNumber\":560,\"dateStr\":\"2025-12-19\",\"ZCpProdCmp_ID\":\"3\",\"ZCpProdCmp_NAME\":\"一分厂\",\"totalWeight\":149.09800,\"totalLength\":5768.52,\"weekStr\":\"六\"},{\"totalNumber\":308,\"dateStr\":\"2025-12-19\",\"ZCpProdCmp_ID\":\"4\",\"ZCpProdCmp_NAME\":\"二分厂\",\"totalWeight\":83.23800,\"totalLength\":3151.11,\"weekStr\":\"六\"},{\"totalNumber\":456,\"dateStr\":\"2025-12-19\",\"ZCpProdCmp_ID\":\"7\",\"ZCpProdCmp_NAME\":\"三分厂\",\"totalWeight\":43.98400,\"totalLength\":4378.68,\"weekStr\":\"六\"}]}")); - } - - /** - * 获取当前产品库存总量及各产品明细 - * @param date - * @return AjaxResult - * { - * "code": 200, - * "data": { - * "total": 2038, - * "unit": "吨", - * "products": [ - * { "name": "油管J55", "amount": 934, "unit": "吨" }, - * { "name": "内涂层油管J55", "amount": 608, "unit": "吨" }, - * { "name": "内衬符合油管J55", "amount": 789, "unit": "吨" }, - * { "name": "套管J55", "amount": 445, "unit": "吨" }, - * { "name": "套管N80Q", "amount": 185, "unit": "吨" } - * ] - * }, - * "message": "success" - * } - */ - @GetMapping("/inventory/current") - public AjaxResult getInventoryCurrent(@RequestParam(required = false) String date) { - return AjaxResult.success(JSON.parseObject("{\"unit\":\"吨\",\"total\":881664.0,\"list\":[{\"totalNumber\":100,\"totalRate\":14,\"BgSubClass_Value\":\"套管\",\"ZCpProdCmp_ID\":\"5\",\"BgSteelGrade\":\"J55\",\"totalWeight\":20463.0,\"ZCP_TyID\":\"10810005\",\"totalLength\":999.25,\"CpProdCmpName\":\"二分厂一号线\"},{\"totalNumber\":203,\"totalRate\":29,\"BgSubClass_Value\":\"套管\",\"ZCpProdCmp_ID\":\"5\",\"BgSteelGrade\":\"J55\",\"totalWeight\":46939.0,\"ZCP_TyID\":\"10810015\",\"totalLength\":2026.5900000000001,\"CpProdCmpName\":\"二分厂一号线\"},{\"totalNumber\":413,\"totalRate\":59,\"BgSubClass_Value\":\"套管\",\"ZCpProdCmp_ID\":\"3\",\"BgSteelGrade\":\"N80Q\",\"totalWeight\":128220.0,\"ZCP_TyID\":\"10810006\",\"totalLength\":4199.71,\"CpProdCmpName\":\"一分厂\"},{\"totalNumber\":952,\"totalRate\":136,\"BgSubClass_Value\":\"套管\",\"ZCpProdCmp_ID\":\"3\",\"BgSteelGrade\":\"J55\",\"totalWeight\":256355.0,\"ZCP_TyID\":\"10810001\",\"totalLength\":9788.23,\"CpProdCmpName\":\"一分厂\"},{\"totalNumber\":176,\"totalRate\":25,\"BgSubClass_Value\":\"套管\",\"ZCpProdCmp_ID\":\"6\",\"BgSteelGrade\":\"110s\",\"totalWeight\":58952.0,\"ZCP_TyID\":\"10810012\",\"totalLength\":1903.44,\"CpProdCmpName\":\"二分厂二号线\"},{\"totalNumber\":1257,\"totalRate\":66,\"BgSubClass_Value\":\"油管\",\"ZCpProdCmp_ID\":\"3\",\"BgSteelGrade\":\"J55\",\"totalWeight\":115630.0,\"ZCP_TyID\":\"10810000\",\"totalLength\":12086.96,\"CpProdCmpName\":\"一分厂\"},{\"totalNumber\":38,\"totalRate\":6,\"BgSubClass_Value\":\"套管（短节）\",\"ZCpProdCmp_ID\":\"3\",\"BgSteelGrade\":\"N80Q\",\"totalWeight\":5950.0,\"ZCP_TyID\":\"10810011\",\"totalLength\":195.83,\"CpProdCmpName\":\"一分厂\"},{\"totalNumber\":577,\"totalRate\":83,\"BgSubClass_Value\":\"套管\",\"ZCpProdCmp_ID\":\"3\",\"BgSteelGrade\":\"N80Q\",\"totalWeight\":157262.0,\"ZCP_TyID\":\"10810003\",\"totalLength\":5914.34,\"CpProdCmpName\":\"一分厂\"},{\"totalNumber\":456,\"totalRate\":24,\"BgSubClass_Value\":\"内衬复合油管\",\"ZCpProdCmp_ID\":\"7\",\"BgSteelGrade\":\"J55\",\"totalWeight\":43994.0,\"ZCP_TyID\":\"10810013\",\"totalLength\":4379.2,\"CpProdCmpName\":\"三分厂\"},{\"totalNumber\":139,\"totalRate\":20,\"BgSubClass_Value\":\"套管\",\"ZCpProdCmp_ID\":\"3\",\"BgSteelGrade\":\"80s\",\"totalWeight\":44355.0,\"ZCP_TyID\":\"10810010\",\"totalLength\":1479.54,\"CpProdCmpName\":\"一分厂\"},{\"totalNumber\":28,\"totalRate\":4,\"BgSubClass_Value\":\"套管（短节）\",\"ZCpProdCmp_ID\":\"3\",\"BgSteelGrade\":\"J55\",\"totalWeight\":1288.0,\"ZCP_TyID\":\"10810021\",\"totalLength\":43.68,\"CpProdCmpName\":\"一分厂\"},{\"totalNumber\":7,\"totalRate\":1,\"BgSubClass_Value\":\"套管\",\"ZCpProdCmp_ID\":\"6\",\"BgSteelGrade\":\"P110\",\"totalWeight\":2256.0,\"ZCP_TyID\":\"10810008\",\"totalLength\":76.11,\"CpProdCmpName\":\"二分厂二号线\"}]}")); - } - - /** - * 获取本月用水、用电量 - * @param date - * @return AjaxResult - * { - * "code": 200, - * "data": { - * "electricity": { - * "value": 2038, - * "unit": "度", - * "changeRate": 5.5 - * }, - * "water": { - * "value": 13.23, - * "unit": "吨", - * "changeRate": -2.1 - * } - * }, - * "message": "success" - * } - */ - @GetMapping("/energy/consumption") - public AjaxResult getEnergyConsumption(@RequestParam(required = false) String date) { - Map data = new HashMap<>(); - - // 模拟用电量数据 - Map electricity = new HashMap<>(); - electricity.put("total", 1289.87); - electricity.put("unit", "度"); - List> electricityDetail = new ArrayList<>(); - Map electricityMap1 = new HashMap<>(); - electricityMap1.put("date","7月"); - electricityMap1.put("total",214.12); - electricityDetail.add(electricityMap1); - Map electricityMap2 = new HashMap<>(); - electricityMap2.put("date","8月"); - electricityMap2.put("total",170.08); - electricityDetail.add(electricityMap2); - Map electricityMap3 = new HashMap<>(); - electricityMap3.put("date","9月"); - electricityMap3.put("total",245.2); - electricityDetail.add(electricityMap3); - Map electricityMap4 = new HashMap<>(); - electricityMap4.put("date","10月"); - electricityMap4.put("total",228.19); - electricityDetail.add(electricityMap4); - Map electricityMap5 = new HashMap<>(); - electricityMap5.put("date","11月"); - electricityMap5.put("total",199.22); - electricityDetail.add(electricityMap5); - Map electricityMap6 = new HashMap<>(); - electricityMap6.put("date","12月"); - electricityMap6.put("total",233.25); - electricityDetail.add(electricityMap6); - electricity.put("changeDetail", electricityDetail); - - // 模拟用水量数据 - Map water = new HashMap<>(); - water.put("total", 832.71); - water.put("unit", "吨"); - List> waterDetail = new ArrayList<>(); - Map waterMap1 = new HashMap<>(); - waterMap1.put("date","7月"); - waterMap1.put("total",139.11); - waterDetail.add(waterMap1); - Map waterMap2 = new HashMap<>(); - waterMap2.put("date","8月"); - waterMap2.put("total",115.05); - waterDetail.add(waterMap2); - Map waterMap3 = new HashMap<>(); - waterMap3.put("date","9月"); - waterMap3.put("total",152.23); - waterDetail.add(waterMap3); - Map waterMap4 = new HashMap<>(); - waterMap4.put("date","10月"); - waterMap4.put("total",140.19); - waterDetail.add(waterMap4); - Map waterMap5 = new HashMap<>(); - waterMap5.put("date","11月"); - waterMap5.put("total",133.28); - waterDetail.add(waterMap5); - Map waterMap6 = new HashMap<>(); - waterMap6.put("date","12月"); - waterMap6.put("total",153.37); - waterDetail.add(waterMap6); - water.put("changeDetail", waterDetail); - - data.put("electricity", electricity); - data.put("water", water); - return AjaxResult.success(data); - } - - /** - * 获取年度生产计划及各月完成情况 - * @param date - * @return AjaxResult - * { - * "code": 200, - * "data": { - * "year": 2025, - * "totalTarget": 3000, - * "currentTotal": 2038, - * "completionRate": 68, - * "unit": "吨", - * "monthlyData": [ - * { "month": 1, "target": 250, "actual": 203, "completionRate": 81 }, - * { "month": 2, "target": 250, "actual": 210, "completionRate": 84 }, - * { "month": 3, "target": 250, "actual": 190, "completionRate": 76 }, - * { "month": 4, "target": 250, "actual": 215, "completionRate": 86 }, - * { "month": 5, "target": 250, "actual": 180, "completionRate": 72 }, - * { "month": 6, "target": 250, "actual": 200, "completionRate": 80 }, - * { "month": 7, "target": 250, "actual": 220, "completionRate": 88 }, - * { "month": 8, "target": 250, "actual": 190, "completionRate": 76 }, - * { "month": 9, "target": 250, "actual": 205, "completionRate": 82 }, - * { "month": 10, "target": 250, "actual": 195, "completionRate": 78 }, - * { "month": 11, "target": 250, "actual": 210, "completionRate": 84 }, - * { "month": 12, "target": 250, "actual": 50, "completionRate": 20 } - * ] - * }, - * "message": "success" - * } - */ - @GetMapping("/production/plan") - public AjaxResult getProductionPlan(@RequestParam(required = false) String date) { - return AjaxResult.success(JSON.parseObject("{\"unit\":\"吨\",\"factory2\":{\"remainingPlan\":[730.52800,0,0,62.75000,0,0,0,0,164.27200,0,0,0],\"totalPlan\":[3300.0,0,2000.0,2100.0,2000.0,2600.0,2600.0,3000.0,3000.0,2400.0,3300.0,3200.0],\"weight\":[2569.47200,2562.41400,2547.36400,2037.25000,2446.83700,2911.78400,2897.38100,3083.26700,2835.72800,2799.61100,3633.67300,3549.75900],\"ratio\":[1.28,100,100,1.03,100,100,100,100,1.06,100,100,100]},\"total\":66801.0,\"factory3\":{\"remainingPlan\":[84.26700,0,1100.0,1200.0,1200.0,944.64900,0,0,1036.27300,624.46200,0,0],\"totalPlan\":[1000.0,0,1100.0,1200.0,1200.0,1200.0,1200.0,1200.0,1200.0,900.0,1200.0,1200.0],\"weight\":[915.73300,0,0,0,0,255.35100,1349.34000,1376.03000,163.72700,275.53800,1378.77300,1273.94200],\"ratio\":[1.09,100,0,0,0,4.70,100,100,7.33,3.27,100,100]},\"monthTotalWeights\":[8100.0,0,6600.0,4800.0,4700.0,5400.0,5100.0,5700.0,5701.0,4500.0,8000.0,8200.0],\"factory1\":{\"remainingPlan\":[489.40500,0,170.85300,0,0,240.14400,0,0,0,0,0,0],\"totalPlan\":[3800.0,0,3500.0,1500.0,1500.0,1600.0,1300.0,1500.0,1501.0,1200.0,3500.0,3800.0],\"weight\":[3310.59500,3088.59800,3329.14700,1673.71200,1679.47700,1359.85600,1691.97400,1669.28900,1573.69700,1675.00400,4462.92800,3957.72300],\"ratio\":[1.15,100,1.05,100,100,1.18,100,100,100,100,100,100]}}")); - } - -} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java index 9b5b0cff..b7c741f9 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java @@ -2,6 +2,7 @@ package com.yanzhu.manage.service.impl; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.hutool.core.util.NumberUtil; +import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.yanzhu.common.core.constant.SecurityConstants; @@ -1218,16 +1219,32 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu } // 生成二维码 try { - String accessToken = wxMaService.getAccessToken(); - String filePath = DateUtils.datePath()+"/"+System.currentTimeMillis()+".png"; - String savePath = ProfileConfig.profilePath+"/"+filePath; - String profilePath = ProfileConfig.profile+"/"+filePath; - log.info("accessToken...{}",accessToken); - // 生成二维码 - File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=2&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(),280); - FileUtil.copyFile(file,new File(savePath)); - proProjectInfoSubdepts.setQrCode(profilePath); - proProjectInfoSubdeptsUsers.setQrCode(profilePath); + //判断是否是项目经理 + JSONObject jsonObject = JSON.parseObject(proProjectInfoSubdeptsUsers.getUserInfos()); + if("1".equals(jsonObject.getString("isNoType"))){ + proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.XMJL.getCode()); + + String accessToken = wxMaService.getAccessToken(); + String filePath = DateUtils.datePath()+"/"+System.currentTimeMillis()+".png"; + String savePath = ProfileConfig.profilePath+"/"+filePath; + String profilePath = ProfileConfig.profile+"/"+filePath; + log.info("accessToken...{}",accessToken); + // 生成二维码 + File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=3&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(),280); + FileUtil.copyFile(file,new File(savePath)); + proProjectInfoSubdeptsUsers.setQrCode(profilePath); + }else{ + String accessToken = wxMaService.getAccessToken(); + String filePath = DateUtils.datePath()+"/"+System.currentTimeMillis()+".png"; + String savePath = ProfileConfig.profilePath+"/"+filePath; + String profilePath = ProfileConfig.profile+"/"+filePath; + log.info("accessToken...{}",accessToken); + // 生成二维码 + File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=2&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(),280); + FileUtil.copyFile(file,new File(savePath)); + proProjectInfoSubdepts.setQrCode(profilePath); + proProjectInfoSubdeptsUsers.setQrCode(profilePath); + } }catch (Exception e){ log.error(e.getMessage()); } @@ -1248,6 +1265,8 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu } proProjectInfoSubdeptsGroupMapper.updateProProjectInfoSubdeptsGroup(manageGroup); } + + }else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(),UserPostEnums.XMJL.getCode())){ // 查询特殊工种绑定班组信息 ProProjectInfoSubdeptsGroup query = new ProProjectInfoSubdeptsGroup(); diff --git a/yanzhu-ui-app/miniprogram/pageage/project_flowable/approveTask/index.wxml b/yanzhu-ui-app/miniprogram/pageage/project_flowable/approveTask/index.wxml index 8c6327a0..52102270 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_flowable/approveTask/index.wxml +++ b/yanzhu-ui-app/miniprogram/pageage/project_flowable/approveTask/index.wxml @@ -283,6 +283,12 @@ {{subDeptUserData.userInfos.bankCardNo}} + + + 是否项目经理 + {{subDeptUserData.userInfos.isNoType=='1'?'是项目经理':'非项目经理'}} + + 高血压、心脏病等基础身体健康问题 diff --git a/yanzhu-ui-app/miniprogram/pageage/project_flowable/detailTask/index.wxml b/yanzhu-ui-app/miniprogram/pageage/project_flowable/detailTask/index.wxml index 859a5eaf..8df63ef5 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_flowable/detailTask/index.wxml +++ b/yanzhu-ui-app/miniprogram/pageage/project_flowable/detailTask/index.wxml @@ -283,6 +283,12 @@ {{subDeptUserData.userInfos.bankCardNo}} + + + 是否项目经理 + {{subDeptUserData.userInfos.isNoType=='1'?'是项目经理':'非项目经理'}} + + 高血压、心脏病等基础身体健康问题 diff --git a/yanzhu-ui-app/miniprogram/pageage/project_flowable/subDepts/index.wxml b/yanzhu-ui-app/miniprogram/pageage/project_flowable/subDepts/index.wxml index b90bb31d..5ca1663c 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_flowable/subDepts/index.wxml +++ b/yanzhu-ui-app/miniprogram/pageage/project_flowable/subDepts/index.wxml @@ -53,6 +53,5 @@ 暂无数据 - \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_qr/index.js b/yanzhu-ui-app/miniprogram/pages/project_qr/index.js index 20d9b8e9..ce1008a3 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_qr/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_qr/index.js @@ -55,6 +55,7 @@ Page({ leaderDegreeGrade: null, userInfos: {}, degreeGrade: null, + isNoType: "0", }, parForm: {}, limit: 1, @@ -76,6 +77,16 @@ Page({ text: "专业分包", }, ], + isNoTypeList: [ + { + id: "0", + text: "非项目经理", + }, + { + id: "1", + text: "是项目经理", + }, + ], craftTypeList: [], craftPostList: [], craftPostAllOrginList: [], @@ -395,6 +406,7 @@ Page({ deptRes.data.address = userInfosJSON.address; deptRes.data.emergencyContact = userInfosJSON.emergencyContact; deptRes.data.contactPhone = userInfosJSON.contactPhone; + deptRes.data.isNoType = userInfosJSON.isNoType; } if (deptRes.data.proProjectInfoSubdeptsUsers.userPicture) { deptRes.data.leaderUserPicture = ( @@ -1181,6 +1193,16 @@ Page({ }); }, + /** + * 负责人是否项目经理 + * @param {*} e + */ + onNoType(e) { + this.setData({ + "form.isNoType": e.detail.id, + }); + }, + /** * 选中岗位级别 * @param {*} e @@ -1708,6 +1730,7 @@ Page({ leaderUserInfos.contactPhone = _form.contactPhone; leaderUserInfos.cardImgPos = _form.leaderCardImgPos; leaderUserInfos.cardImgInv = _form.leaderCardImgInv; + leaderUserInfos.isNoType = _form.isNoType; _form.leaderUserInfos = JSON.stringify(leaderUserInfos); if ( _form.proProjectInfoSubdeptsUsers && diff --git a/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml index eaf42dc3..1fc107e2 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml @@ -212,6 +212,12 @@ + + 是否为项目经理 + + + + diff --git a/yanzhu-ui-vue3/src/views/flowable/task/myProcess/detail/indexDrawer.vue b/yanzhu-ui-vue3/src/views/flowable/task/myProcess/detail/indexDrawer.vue index bfed3a69..ef7db680 100644 --- a/yanzhu-ui-vue3/src/views/flowable/task/myProcess/detail/indexDrawer.vue +++ b/yanzhu-ui-vue3/src/views/flowable/task/myProcess/detail/indexDrawer.vue @@ -266,6 +266,9 @@ {{ initData.degreeGradeName }} + + {{ initData.userInfos.isNoType=='1'?'是项目经理':'非项目经理' }} + diff --git a/yanzhu-ui-vue3/src/views/flowable/task/todo/detail/indexDrawer.vue b/yanzhu-ui-vue3/src/views/flowable/task/todo/detail/indexDrawer.vue index dbb107d4..57e77711 100644 --- a/yanzhu-ui-vue3/src/views/flowable/task/todo/detail/indexDrawer.vue +++ b/yanzhu-ui-vue3/src/views/flowable/task/todo/detail/indexDrawer.vue @@ -196,6 +196,9 @@ {{ initData.degreeGradeName }} + + {{ initData.userInfos.isNoType=='1'?'是项目经理':'非项目经理' }} +