diff --git a/src/main/java/com/bonus/gzgqj/business/aqgqj/MaTypeVo.java b/src/main/java/com/bonus/gzgqj/business/aqgqj/MaTypeVo.java new file mode 100644 index 0000000..f47fb12 --- /dev/null +++ b/src/main/java/com/bonus/gzgqj/business/aqgqj/MaTypeVo.java @@ -0,0 +1,45 @@ +package com.bonus.gzgqj.business.aqgqj; + +import lombok.Data; + +/** + * 工器具类型 + * @author 黑子 + */ +@Data +public class MaTypeVo extends ParentVo { + + private String id; + /** + * 父节点id + */ + private String parentId; + /** + * 名称 + */ + private String name; + /** + * 库存数量 + */ + private String storageNum; + /** + * 单位 + */ + private String unitName; + + private String isActive; + /** + * 备注 + */ + private String remark; + + private String level; + /** + * 周期 + */ + private String cycle; + + + + +} diff --git a/src/main/java/com/bonus/gzgqj/business/aqgqj/ParentVo.java b/src/main/java/com/bonus/gzgqj/business/aqgqj/ParentVo.java new file mode 100644 index 0000000..be96217 --- /dev/null +++ b/src/main/java/com/bonus/gzgqj/business/aqgqj/ParentVo.java @@ -0,0 +1,36 @@ +package com.bonus.gzgqj.business.aqgqj; + +import lombok.Data; + +/** + * @author 黑子 + */ +@Data +public class ParentVo { + + /** + * 创建人 + */ + private String creator; + + private String createTime; + /** + * 修改人 + */ + private String updater; + + private String updateTime; + /** + * 是否有效 0 正常 1无效 + */ + private String isActive; + /** + * 状态 + */ + private String status; + /** + * 关键字 + */ + private String keyWord; + +} diff --git a/src/main/java/com/bonus/gzgqj/business/aqgqj/SupplierVo.java b/src/main/java/com/bonus/gzgqj/business/aqgqj/SupplierVo.java new file mode 100644 index 0000000..6f4be01 --- /dev/null +++ b/src/main/java/com/bonus/gzgqj/business/aqgqj/SupplierVo.java @@ -0,0 +1,34 @@ +package com.bonus.gzgqj.business.aqgqj; + +import lombok.Data; + +/** + * 供应商 管理 + * @author 黑子 + */ +@Data +public class SupplierVo extends ParentVo{ + + private String id; + /** + * 名称 + */ + private String name; + /** + * 编码 + */ + private String code; + /** + * 联系人 + */ + private String link; + /** + * 联系电话 + */ + private String phone; + + private String remark; + + + +} diff --git a/src/main/java/com/bonus/gzgqj/business/bases/controller/StatisticsController.java b/src/main/java/com/bonus/gzgqj/business/bases/controller/StatisticsController.java index e55e731..091e43c 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/controller/StatisticsController.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/controller/StatisticsController.java @@ -10,6 +10,7 @@ import com.bonus.gzgqj.business.bases.service.StatisticsServiceImpl; import com.bonus.gzgqj.business.plan.entity.FileUploadVo; import com.bonus.gzgqj.business.plan.entity.PlanApplyBeanPlanExport; import com.bonus.gzgqj.manager.annotation.DecryptAndVerify; +import com.bonus.gzgqj.manager.common.util.StringHelper; import com.bonus.gzgqj.manager.core.entity.EncryptedReq; import com.bonus.gzgqj.manager.webResult.ServerResponse; import com.github.pagehelper.PageHelper; @@ -122,6 +123,15 @@ public class StatisticsController { list.forEach(vo->{ vo.setXh(num[0]); num[0]++; + if(StringHelper.isEmpty(vo.getLyNum())){ + vo.setLyNum("0"); + } + if(StringHelper.isEmpty(vo.getLydNum())){ + vo.setLydNum("0"); + } + if(StringHelper.isEmpty(vo.getLyMoney())){ + vo.setLyMoney("0"); + } }); ExportParams exportParams = new ExportParams("工程统计", "工程统计", ExcelType.XSSF); Workbook workbook = ExcelExportUtil.exportExcel(exportParams, ProjectInfoVo.class, list); diff --git a/src/main/java/com/bonus/gzgqj/business/bases/entity/ProjectInfoVo.java b/src/main/java/com/bonus/gzgqj/business/bases/entity/ProjectInfoVo.java index 6b15444..e2ac99a 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/entity/ProjectInfoVo.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/entity/ProjectInfoVo.java @@ -45,6 +45,7 @@ public class ProjectInfoVo { /** * 维修单数量 */ + @Excel(name = "领用金额", width = 10.0, orderNum = "6") private String lyMoney; diff --git a/src/main/java/com/bonus/gzgqj/business/bases/service/PartApplyServiceImpl.java b/src/main/java/com/bonus/gzgqj/business/bases/service/PartApplyServiceImpl.java index 56949fe..0e28b9e 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/service/PartApplyServiceImpl.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/service/PartApplyServiceImpl.java @@ -72,14 +72,14 @@ public class PartApplyServiceImpl implements PartApplyService{ String infoMsg = String.join(",", info); vo.setInfoMsg(infoMsg); //图片转换 -// String bast641=transBast64(vo.getLyUrl()); -// String bast642=transBast64(vo.getCkUrl()); -// String bast643=transBast64(vo.getShUrl()); -// String bast644=transBast64(vo.getZdUrl()); -// vo.setLyUrl(bast641); -// vo.setCkUser(bast642); -// vo.setShUrl(bast643); -// vo.setZdUrl(bast644); + String bast641=transBast64(vo.getLyUrl()); + String bast642=transBast64(vo.getCkUrl()); + String bast643=transBast64(vo.getShUrl()); + String bast644=transBast64(vo.getZdUrl()); + vo.setLyUrl(bast641); + vo.setCkUrl(bast642); + vo.setShUrl(bast643); + vo.setZdUrl(bast644); List flieList=uploadService.getFileList(data.getId(),"t_part_apply",null); vo.setFileList(flieList); return ServerResponse.createSuccess(vo); @@ -211,7 +211,7 @@ public class PartApplyServiceImpl implements PartApplyService{ } - public String transBast64(String url){ + public static String transBast64(String url){ try{ if(StringHelper.isEmpty(url)){ return ""; @@ -224,8 +224,10 @@ public class PartApplyServiceImpl implements PartApplyService{ } return ""; + } - + public static void main(String[] args) { + System.err.println(transBast64("D:\\files\\zg_gqj\\20241109\\173113057456537938315.jpg")); } } diff --git a/src/main/java/com/bonus/gzgqj/business/plan/entity/ProNeedInfo.java b/src/main/java/com/bonus/gzgqj/business/plan/entity/ProNeedInfo.java index 25c5089..29dd6dd 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/entity/ProNeedInfo.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/entity/ProNeedInfo.java @@ -80,6 +80,8 @@ public class ProNeedInfo extends PageInfo { */ private String needType; + private String code; + /** diff --git a/src/main/java/com/bonus/gzgqj/business/plan/service/PlanAuditServiceImpl.java b/src/main/java/com/bonus/gzgqj/business/plan/service/PlanAuditServiceImpl.java index 76f5c54..db6ea05 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/service/PlanAuditServiceImpl.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/service/PlanAuditServiceImpl.java @@ -175,6 +175,7 @@ public class PlanAuditServiceImpl implements PlanAuditService { } } }catch (Exception e) { + log.error(e.toString(),e); throw new RuntimeException("审核失败"); } @@ -187,7 +188,7 @@ public class PlanAuditServiceImpl implements PlanAuditService { */ public void aduitError(AuditBean vo,String statusType,SelfUserEntity user) { //修改审核状态 - vo.setAuditStatus(statusType);//审核节点 + vo.setAuditType(statusType);//审核节点 dao.updatePlanAudit(vo); vo.setAuditor(Integer.parseInt(user.getUserId()+"")); vo.setUpdater(Integer.parseInt(user.getUserId()+"")); diff --git a/src/main/java/com/bonus/gzgqj/manager/common/util/SecurityUtils.java b/src/main/java/com/bonus/gzgqj/manager/common/util/SecurityUtils.java index 2034a9d..711be35 100644 --- a/src/main/java/com/bonus/gzgqj/manager/common/util/SecurityUtils.java +++ b/src/main/java/com/bonus/gzgqj/manager/common/util/SecurityUtils.java @@ -56,7 +56,10 @@ public class SecurityUtils { // 从header获取token标识/请求参数中获取 String token = request.getHeader(TokenConstants.AUTHENTICATION); if(StringUtils.isBlank(token)){ - token = request.getParameter(TokenConstants.AUTHENTICATION_PARAM); + token = request.getParameter(TokenConstants.AUTHENTICATION_PARAM1); + if(StringUtils.isBlank(token)){ + token = request.getParameter(TokenConstants.AUTHENTICATION_PARAM); + } } return replaceTokenPrefix(token); } diff --git a/src/main/java/com/bonus/gzgqj/manager/constant/TokenConstants.java b/src/main/java/com/bonus/gzgqj/manager/constant/TokenConstants.java index 220daa8..057b227 100644 --- a/src/main/java/com/bonus/gzgqj/manager/constant/TokenConstants.java +++ b/src/main/java/com/bonus/gzgqj/manager/constant/TokenConstants.java @@ -11,7 +11,7 @@ public class TokenConstants * 令牌自定义标识 */ public static final String AUTHENTICATION = "Authorization"; - + public static final String AUTHENTICATION_PARAM1= "auth"; public static final String AUTHENTICATION_PARAM = "token"; /** diff --git a/src/main/resources/mappers/bases/StatisticsMapper.xml b/src/main/resources/mappers/bases/StatisticsMapper.xml index 338a002..57dbf34 100644 --- a/src/main/resources/mappers/bases/StatisticsMapper.xml +++ b/src/main/resources/mappers/bases/StatisticsMapper.xml @@ -7,7 +7,7 @@ FROM pa_type where pa_type.`level`=1 AND is_active=1 UNION ALL - select IFNULL( count(1),0) + select IFNULL( SUM(num),0) FROM pa_type where pa_type.`level`=3 AND is_active=1 UNION ALL diff --git a/src/main/resources/mappers/plan/PlanAuditMapper.xml b/src/main/resources/mappers/plan/PlanAuditMapper.xml index c37c55a..e15adc9 100644 --- a/src/main/resources/mappers/plan/PlanAuditMapper.xml +++ b/src/main/resources/mappers/plan/PlanAuditMapper.xml @@ -47,7 +47,8 @@ @@ -108,10 +109,9 @@ insert into t_pro_plan_info - (pro_id,need_num,plan_num,record_num,out_num,status,last_day,tz_num) values - (#{proId},#{needNum},#{planNum},#{recordNum},#{outNum},#{status},#{lastDay},#{tzNum} ,out2_num=#{outNum2},record2_num=#{recordNum2} ) + (pro_id,need_num,plan_num,record_num,out_num,status,last_day,tz_num,out2_num,record2_num) values + (#{proId},#{needNum},#{planNum},#{recordNum},#{outNum},#{status},#{lastDay},#{tzNum} ,#{outNum2},#{recordNum2} ) - update t_pro_plan_info set need_num=#{needNum},plan_num=#{planNum},status=#{status} where pro_id=#{proId} diff --git a/src/main/resources/mappers/plan/PlanOutMapper.xml b/src/main/resources/mappers/plan/PlanOutMapper.xml index 4fc74fe..e4760fe 100644 --- a/src/main/resources/mappers/plan/PlanOutMapper.xml +++ b/src/main/resources/mappers/plan/PlanOutMapper.xml @@ -130,16 +130,16 @@