BUG修改

pom.xml

@@ -5,8 +5,8 @@
     <groupId>com.bonus</groupId>
     <artifactId>gz_gqj</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>aqd</name>
+    <name>gz_gqj</name>
-    <description>aqd</description>
+    <description>gz_gqj</description>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

src/main/java/com/bonus/gzgqj/business/aqgqj/MaTypeVo.java

@@ -1,45 +0,0 @@
-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;
-
-
-
-
-}

src/main/java/com/bonus/gzgqj/business/aqgqj/ParentVo.java

@@ -1,36 +0,0 @@
-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;
-
-}

src/main/java/com/bonus/gzgqj/business/aqgqj/SupplierVo.java

@@ -1,34 +0,0 @@
-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;
-
-
-
-}

src/main/java/com/bonus/gzgqj/business/bases/controller/PartInputController.java

@@ -68,7 +68,7 @@ public class PartInputController {
             List<PartInputVo> list = service.findByPage(dto);
             final int[] num = {1};
             list.forEach(vo->{
-                if("0".equals(vo.equals(vo.getIsFlag()))){
+                if("0".equals(vo.getIsFlag())){
                     vo.setIsFlag("否");
                 }else{
                     vo.setIsFlag("是");

src/main/java/com/bonus/gzgqj/business/plan/entity/PlanApplyAuditBean.java

@@ -30,7 +30,7 @@ public class PlanApplyAuditBean {
 	/**
 	 * 工程id
 	 */
-	@Excel(name = "工程名称", width = 12.0, orderNum = "2")
+
 	private String projectId;
 		
 	/**
@@ -86,6 +86,7 @@ public class PlanApplyAuditBean {
 	
 	private String statusType;
 
+	@Excel(name = "工程名称", width = 12.0, orderNum = "2")
 	private String proName;
 	
 	

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 # 配置端口
 server:
-  port: 21995
+  port: 21520
 #  servlet:
 #    context-path: /aqd_screen
   max-http-header-size: 10240
@@ -8,22 +8,22 @@ spring:
   # 配置数据源
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-#    url: jdbc:mysql://192.168.0.14:1109/gzimtcs?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+    url: jdbc:mysql://192.168.0.14:1109/gzimtcs?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
-#    username: root
+    username: root
-#    password: zhzadmin@gzimtcs14!
+    password: zhzadmin@gzimtcs14!
-    url: jdbc:mysql://127.0.0.1:3306/gzimtcs?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+#    url: jdbc:mysql://127.0.0.1:3306/gzimtcs?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
-    username: mroot
+#    username: mroot
-    password: bonus@admin123
+#    password: bonus@admin123
     type: com.alibaba.druid.pool.DruidDataSource
-#  redis:
-#    host: 192.168.0.14
-#    port: 2003
-#    password: Fyzbns@Redis123!
-#    database: 7
   redis:
-      host: 127.0.0.1
+    host: 192.168.0.14
-      port: 6379
+    port: 2003
+    password: Fyzbns@Redis123!
     database: 7
+#    redis:
+#      host: 127.0.0.1
+#      port: 6379
+#      database: 7
   servlet:
     multipart:
       max-file-size: -1

src/main/resources/mappers/bases/PaTypeMapper.xml

@@ -25,11 +25,11 @@
 		WHERE is_active=1
 	</select>
 	<select id="getTypeDetails" resultType="com.bonus.gzgqj.business.bases.entity.PaTypeVo">
-		select pt.id,pt.parent_id parentId,pt.name,pt.num,pt1.name parentName,
+		select pt.id,pt.parent_id parentId,pt.name,pt.num,IFNULL(pt1.name,'配件类型列表') parentName,
 			   pt.price,pt.unit ,pt.weight,pt.is_consumables ,
 			   pt.remarks,pt.is_active ,pt.level,pt.warn_num
 		FROM pa_type pt
-		left join   pa_type pt1 on pt.parent_id=pt1.id  and pt1.`level`=2 and pt1.is_active=1
+				 left join pa_type pt1 on pt.parent_id=pt1.id  and pt1.is_active=1
 		WHERE pt.is_active=1 and pt.id=#{id}
 	</select>
 	<select id="getChildList" resultType="java.lang.String">

src/main/resources/mappers/plan/PlanOutMapper.xml

@@ -303,7 +303,7 @@
 
     <!--查询模型-->
     <select id="getDataInfoDetails" resultType="com.bonus.gzgqj.business.plan.entity.ProNeedInfo">
-        select pni.type,pni.name,pni.module,pni.module_id moduleId,SUM(pni.need_num) needNum,SUM(pni.fh_num) fhNum,SUM(pni.tz_num) tzNum,
+        select pni.type,pni.name,pni.module,pni.module_id moduleId,SUM(pni.need_num) needNum,SUM(pni.fh_num+pni.tz_num) fhNum,SUM(pni.tz_num) tzNum,
                pro.num  proNum,plan.num planNum,pni.unit,SUM(if(pni.need_num-pni.fh_num-pni.tz_num>0,pni.need_num-pni.fh_num-pni.tz_num,0)) wfhNum,
                mt.num kuNum ,SUM(if(pni.need_num-pni.fh_num-pni.tz_num>0,pni.need_num-pni.fh_num-pni.tz_num,0)) clNum
         from t_pro_need_info  pni