diff --git a/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanDetailVo.java b/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanDetailVo.java index d0e39f1..4283936 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanDetailVo.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanDetailVo.java @@ -47,12 +47,18 @@ public class CarNeedPlanDetailVo { private String unit; private String modelId; + /** * 需用量 */ @Excel(name = "需用量", width = 10.0, orderNum = "5") private int needNum; + /** + * 需求计划申请--所需的车辆规格 + */ + private String carSpec; + private String needDay; /** diff --git a/src/main/java/com/bonus/gzcar/business/backstage/entity/CarUserVo.java b/src/main/java/com/bonus/gzcar/business/backstage/entity/CarUserVo.java index a9ecbec..b836ade 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/entity/CarUserVo.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/entity/CarUserVo.java @@ -31,7 +31,9 @@ public class CarUserVo extends ParentVo { private String userId; - private String userName; + private String userName; + + private String nikeName; } diff --git a/src/main/java/com/bonus/gzcar/business/backstage/mapper/CarSupMapper.java b/src/main/java/com/bonus/gzcar/business/backstage/mapper/CarSupMapper.java index 275cfca..6a82336 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/mapper/CarSupMapper.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/mapper/CarSupMapper.java @@ -35,12 +35,19 @@ public interface CarSupMapper { int updateCarSupData(CarSupVo data); /** - * 查询人员父节点 + * 查询人员父节点--公司级 * @param data * @return */ List gteUserParentList(CarUserVo data); + /** + * 查询人员父节点--分公司级 + * @param data + * @return + */ + List gteUserParentListByOrg(CarUserVo data); + /** * 查询人员集合 * @param data diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/CarNeedPlanServiceImpl.java b/src/main/java/com/bonus/gzcar/business/backstage/service/CarNeedPlanServiceImpl.java index 0ae9f93..1ecfae3 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/service/CarNeedPlanServiceImpl.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/service/CarNeedPlanServiceImpl.java @@ -111,7 +111,7 @@ public class CarNeedPlanServiceImpl implements CarNeedPlanService{ return ServerResponse.createErroe("计划编号已存在"); } if(files==null || files.length<1){ - return ServerResponse.createErroe("请上传附件"); + System.out.println("未上传计划附件"); } }else{ @@ -127,9 +127,11 @@ public class CarNeedPlanServiceImpl implements CarNeedPlanService{ int num =mapper.addNeedPlanData(vo); //紧急的上传附件 if("1".equals(vo.getApplyType())){ - List fileList=uploadService.uploadImage(files,vo.getId(),"car_plan_apply","紧急用车附件"); - if(fileList.size()!=files.length){ - return ServerResponse.createErroe("附件上传失败"); + if (files != null && files.length > 0) { + List fileList=uploadService.uploadImage(files,vo.getId(),"car_plan_apply","紧急用车附件"); + if(fileList.size()!=files.length){ + return ServerResponse.createErroe("附件上传失败"); + } } recordService.addRecord(vo.getId(),"0","1","2","紧急内部用车","0"); }else{ diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/CarSupServiceImpl.java b/src/main/java/com/bonus/gzcar/business/backstage/service/CarSupServiceImpl.java index 2bd8a10..31b4e69 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/service/CarSupServiceImpl.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/service/CarSupServiceImpl.java @@ -131,7 +131,8 @@ public class CarSupServiceImpl implements CarSupService{ Map map= Maps.newHashMap(); try{ - List list=mapper.gteUserParentList(data); +// List list=mapper.gteUserParentList(data); + List list=mapper.gteUserParentListByOrg(data); List userList=mapper.getUserTreeList(data); List checkList=mapper.getUserCheckList(data); list.forEach(vo->{ diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml new file mode 100644 index 0000000..8795de7 --- /dev/null +++ b/src/main/resources/application-local.yml @@ -0,0 +1,55 @@ +# 配置端口 +server: + port: 21522 + servlet: + context-path: +# context-path: /gz_car + max-http-header-size: 10240 +spring: + # 配置数据源 + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver +# url: jdbc:mysql://10.1.0.141:13306/gzimt1.0?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true +# username: root +# password: gsyfq@09mysql! + url: jdbc:mysql://127.0.0.1:3306/gzimt250319?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + username: ruanliang + password: ruanliang@MYSQL +# type: com.alibaba.druid.pool.DruidDataSource + redis: + host: localhost + port: 6379 + password: +# host: 10.1.0.141 +# port: 6379 +# password: Bonus@admin123! + database: 7 + # database: 3 + servlet: + multipart: + max-file-size: -1 + max-request-size: -1 +#mapper配置 +mybatis: + mapper-locations: classpath:mappers/**/*Mapper.xml,mappers/**/**/*Mapper.xml +#日志配置 +logging: + config: classpath:logback-boot.xml +log: + level: + root: info + my: debug + file: logs/sys-back.log + maxsize: 30MB +#是否开启安全模式 +zhly: + aq: + enable: false + +file: + upload_path: + windows: D://files/gz_car + linux: /home/zg_gqj/files + + + diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml new file mode 100644 index 0000000..a44a74b --- /dev/null +++ b/src/main/resources/application-prod.yml @@ -0,0 +1,47 @@ +# 配置端口 +server: + port: 21522 + servlet: + context-path: + max-http-header-size: 10240 +spring: + # 配置数据源 + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://10.1.0.141:13306/gzimt1.0?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true + username: root + password: gsyfq@09mysql! +# type: com.alibaba.druid.pool.DruidDataSource + redis: + host: 10.1.0.141 + port: 6379 + password: Bonus@admin123! + database: 7 + servlet: + multipart: + max-file-size: -1 + max-request-size: -1 +#mapper配置 +mybatis: + mapper-locations: classpath:mappers/**/*Mapper.xml,mappers/**/**/*Mapper.xml +#日志配置 +logging: + config: classpath:logback-boot.xml +log: + level: + root: info + my: debug + file: logs/sys-back.log + maxsize: 30MB +#是否开启安全模式 +zhly: + aq: + enable: false + +file: + upload_path: + windows: D://files/gz_car + linux: /home/zg_gqj/files + + + diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml new file mode 100644 index 0000000..36e93b4 --- /dev/null +++ b/src/main/resources/application-test.yml @@ -0,0 +1,50 @@ +# 配置端口 +server: + port: 21522 + servlet: + context-path: /gz-car + max-http-header-size: 10240 +spring: + # 配置数据源 + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://192.168.0.16:4419/gzimtcs?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true + username: root + password: Bonus@admin123! + # url: jdbc:mysql://127.0.0.1:3306/gzimtcs?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + # username: mroot + # password: bonus@admin123 + # type: com.alibaba.druid.pool.DruidDataSource + redis: + host: 192.168.0.16 + port: 2001 + password: Zhzbns@Redis123! + database: 1 + servlet: + multipart: + max-file-size: -1 + max-request-size: -1 +#mapper配置 +mybatis: + mapper-locations: classpath:mappers/**/*Mapper.xml,mappers/**/**/*Mapper.xml +#日志配置 +logging: + config: classpath:logback-boot.xml +log: + level: + root: info + my: debug + file: logs/sys-back.log + maxsize: 30MB +#是否开启安全模式 +zhly: + aq: + enable: false + +file: + upload_path: + windows: D://files/gz_car + linux: /home/zg_gqj/files + + + diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index bd748b0..027b4e3 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,54 +1,3 @@ -# 配置端口 -server: - port: 21522 - servlet: - context-path: /gz-car - max-http-header-size: 10240 spring: - # 配置数据源 - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.0.16:4419/gzimtcs?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true - username: root - password: Bonus@admin123! -# url: jdbc:mysql://localhost:13306/gzimt250319?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false -# username: root -# password: liang971108@Sun -# type: com.alibaba.druid.pool.DruidDataSource - redis: - host: 192.168.0.16 - port: 2001 - password: Zhzbns@Redis123! - database: 1 -# host: 127.0.0.1 -# port: 6379 -# password: liang971108lu@L -# database: 7 - servlet: - multipart: - max-file-size: -1 - max-request-size: -1 -#mapper配置 -mybatis: - mapper-locations: classpath:mappers/**/*Mapper.xml,mappers/**/**/*Mapper.xml -#日志配置 -logging: - config: classpath:logback-boot.xml -log: - level: - root: info - my: debug - file: logs/sys-back.log - maxsize: 30MB -#是否开启安全模式 -zhly: - aq: - enable: false - -file: - upload_path: - windows: e://files/gz_car - linux: /home/zg_gqj/files - - - + profiles: + active: test \ No newline at end of file diff --git a/src/main/resources/mappers/business/backstage/CarDriverMapper.xml b/src/main/resources/mappers/business/backstage/CarDriverMapper.xml index f9a7068..555bc49 100644 --- a/src/main/resources/mappers/business/backstage/CarDriverMapper.xml +++ b/src/main/resources/mappers/business/backstage/CarDriverMapper.xml @@ -12,8 +12,8 @@ update car_driver_info set is_active=0 where id=#{id} - update car_driver_info set name=#{name}, phone=#{phone},sup_id=#{supId},updator=#{updater},is_white=#{isWhiteList} - update_time=now() + update car_driver_info set name=#{name}, phone=#{phone},sup_id=#{supId},updator=#{updater}, + is_white=#{isWhiteList},update_time=now() where id=#{id} diff --git a/src/main/resources/mappers/business/backstage/CarNeedPlanMapper.xml b/src/main/resources/mappers/business/backstage/CarNeedPlanMapper.xml index 93dbf84..9151275 100644 --- a/src/main/resources/mappers/business/backstage/CarNeedPlanMapper.xml +++ b/src/main/resources/mappers/business/backstage/CarNeedPlanMapper.xml @@ -16,10 +16,10 @@ insert into car_plan_details( - apply_id, model_id, need_num, need_day, remark,plan_type, back_date + apply_id, model_id, need_num, need_day, remark,plan_type, back_date, car_spec )values - (#{param.id},#{item.modelId},#{item.needNum},#{item.needDay},#{item.remark},#{param.type},#{item.backDate}) + (#{param.id},#{item.modelId},#{item.needNum},#{item.needDay},#{item.remark},#{param.type},#{item.backDate},#{item.carSpec}) @@ -108,8 +108,8 @@ where cpa.id=#{id} select id, name ,code, link, phone, is_active isActive, creator, create_time createTime, remark,user_names userNames @@ -39,6 +45,7 @@ order by create_time desc + + + + + + + + + + \ No newline at end of file