From 4b21b55246ba57986f0ccf4ba8bf0a57c1991aaa Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Tue, 4 Mar 2025 09:19:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E8=8E=B7=E5=8F=96=E5=A4=96=E7=A7=9F?=
 =?UTF-8?q?=E8=B5=84=E4=BA=A7=E7=B1=BB=EF=BC=8C=E5=85=A5=E5=BA=93=E4=BA=BA?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E8=87=AA=E5=8A=A8=E8=8E=B7=E5=8F=96=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=85=B6=E4=BB=96=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bases/service/PartInputServiceImpl.java   | 10 ++-
 .../plan/entity/PlanDataDetailBean.java       | 18 ++---
 .../mappers/bases/PartInputMapper.xml         |  8 +-
 .../mappers/plan/PlanApplicationMapper.xml    | 78 +++++++++++++------
 4 files changed, 73 insertions(+), 41 deletions(-)

diff --git a/src/main/java/com/bonus/gzgqj/business/bases/service/PartInputServiceImpl.java b/src/main/java/com/bonus/gzgqj/business/bases/service/PartInputServiceImpl.java
index d9536e9..2d6282b 100644
--- a/src/main/java/com/bonus/gzgqj/business/bases/service/PartInputServiceImpl.java
+++ b/src/main/java/com/bonus/gzgqj/business/bases/service/PartInputServiceImpl.java
@@ -68,9 +68,9 @@ public class PartInputServiceImpl implements PartInputService{
       try{
           String params=request.getParameter("params");
           PartInputVo vo= JSON.parseObject(params,PartInputVo.class);
-          if(StringHelper.isEmpty(vo.getInputUser())){
-              return  ServerResponse.createErroe("请填写入库人");
-          }
+//          if(StringHelper.isEmpty(vo.getInputUser())){
+//              return  ServerResponse.createErroe("请填写入库人");
+//          }
           if(StringHelper.isEmpty(vo.getInputDay())){
               return  ServerResponse.createErroe("请填写入库日期");
           }
@@ -82,7 +82,9 @@ public class PartInputServiceImpl implements PartInputService{
               return  ServerResponse.createErroe("请上传入库配件");
           }
           Long userId= Objects.requireNonNull(UserUtil.getLoginUser()).getUserId();
-         // String userName=UserUtil.getLoginUser().getUsername();
+//          String userName=UserUtil.getLoginUser().getUsername();
+//          System.err.println(userName);
+          vo.setInputUser(userId.toString());
           String code=getCode();
           vo.setCode(code);
           vo.setCreator(userId.toString());
diff --git a/src/main/java/com/bonus/gzgqj/business/plan/entity/PlanDataDetailBean.java b/src/main/java/com/bonus/gzgqj/business/plan/entity/PlanDataDetailBean.java
index 1189088..608e01e 100644
--- a/src/main/java/com/bonus/gzgqj/business/plan/entity/PlanDataDetailBean.java
+++ b/src/main/java/com/bonus/gzgqj/business/plan/entity/PlanDataDetailBean.java
@@ -21,36 +21,39 @@ public class PlanDataDetailBean {
 	private String  applyId;
 
 	private String id;
+
+	@Excel(name = "工程名称", width = 10.0,height = 20.0, orderNum = "1")
+	private String proName;
 	
 	/**
 	 * 类型		
 	 */
-	@Excel(name = "物机类型", width = 10.0,height = 20.0, orderNum = "1")
+	@Excel(name = "物机类型", width = 10.0,height = 20.0, orderNum = "2")
 	private String  type;
 	/**
 	 * 名称
 	 */
-	@Excel(name = "物机名称", width = 10.0,height = 20.0, orderNum = "2")
+	@Excel(name = "物机名称", width = 10.0,height = 20.0, orderNum = "3")
 	private String typeName;
 	/**
 	 * 规格
 	 */
-	@Excel(name = "规格型号", width = 10.0,height = 20.0, orderNum = "3")
+	@Excel(name = "规格型号", width = 10.0,height = 20.0, orderNum = "4")
 	private String module;
 	/**
 	 * 单位
 	 */
-	@Excel(name = "单位", width = 10.0,height = 20.0, orderNum = "4")
+	@Excel(name = "单位", width = 10.0,height = 20.0, orderNum = "5")
 	private String unit;
 	/**
 	 * 需用量
 	 */
-	@Excel(name = "需用量", width = 10.0,height = 20.0, orderNum = "5")
+	@Excel(name = "需用量", width = 10.0,height = 20.0, orderNum = "6")
 	private int needNum;
 	/**
 	 * 需用天数
 	 */
-	@Excel(name = "需用天数", width = 10.0,height = 20.0, orderNum = "6")
+	@Excel(name = "需用天数", width = 10.0,height = 20.0, orderNum = "7")
 	private String times;
 	/**
 	 * 备注
@@ -69,8 +72,5 @@ public class PlanDataDetailBean {
 	private String model;
 
 
-	
-	
-	
 
 }
diff --git a/src/main/resources/mappers/bases/PartInputMapper.xml b/src/main/resources/mappers/bases/PartInputMapper.xml
index 457f559..ce792e0 100644
--- a/src/main/resources/mappers/bases/PartInputMapper.xml
+++ b/src/main/resources/mappers/bases/PartInputMapper.xml
@@ -42,13 +42,14 @@
 
     <!--分页查询-->
     <select id="findByPage" resultType="com.bonus.gzgqj.business.bases.entity.PartInputVo">
-        select tpi.id,tpi.code,tpi.creator,tpi.input_day inputDay,tpi.input_user inputUser,
+        select tpi.id,tpi.code,tpi.creator,tpi.input_day inputDay,pu.`NAME` inputUser,
                tpi.input_num inputNum,tpi.all_price allPrice,tpi.remark,tpi.is_flag isFlag
             from  t_part_input tpi
+            LEFT JOIN pm_user pu on pu.ID=tpi.input_user
         <where>
             <if test="keyWord!=null and keyWord!=''">
                 and (tpi.code like concat('%',#{keyWord},'%') or
-                    tpi.input_user like concat('%',#{keyWord},'%') or
+                    pu.`NAME` like concat('%',#{keyWord},'%') or
                     tpi.input_day like concat('%',#{keyWord},'%') or
                     tpi.remark like concat('%',#{keyWord},'%')
                 )
@@ -71,9 +72,10 @@
     </select>
     <!--查询 入库详情-->
     <select id="getInputDetails" resultType="com.bonus.gzgqj.business.bases.entity.PartInputVo">
-        select tpi.id,tpi.code,tpi.creator,tpi.input_day inputDay,tpi.input_user inputUser,
+        select tpi.id,tpi.code,tpi.creator,tpi.input_day inputDay,pu.`NAME` inputUser,
                tpi.input_num inputNum,tpi.all_price allPrice,tpi.remark,tpi.is_flag isFlag
         from  t_part_input tpi
+                  LEFT JOIN pm_user pu on pu.ID=tpi.input_user
         WHERE   tpi.id=#{id}
     </select>
     <select id="getInfoById" resultType="java.lang.String">
diff --git a/src/main/resources/mappers/plan/PlanApplicationMapper.xml b/src/main/resources/mappers/plan/PlanApplicationMapper.xml
index 1c7066e..363c835 100644
--- a/src/main/resources/mappers/plan/PlanApplicationMapper.xml
+++ b/src/main/resources/mappers/plan/PlanApplicationMapper.xml
@@ -152,22 +152,33 @@
 	</select>
 	<!-- 查询 内容集合-->
 	<select id="getDetailsList" parameterType="com.bonus.gzgqj.business.plan.entity.PlanDataDetailBean" resultType="com.bonus.gzgqj.business.plan.entity.PlanDataDetailBean">
-		select	id,apply_id  applyId,model_id moduleId,
-				need_num needNum,need_day times,
-				remark remarks,type,name typeName,
-				module,unit
-				from t_plan_details
-		where apply_id=#{id}
+		SELECT
+		tpd.id,
+		tpd.apply_id applyId,
+		tpd.model_id moduleId,
+		tpd.need_num needNum,
+		tpd.need_day times,
+		tpd.remark remarks,
+		tpd.type,
+		tpd.NAME typeName,
+		tpd.module,
+		tpd.unit,
+		pro.`NAME` as proName
+		FROM
+		t_plan_details tpd
+		LEFT JOIN t_plan_apply tpa on tpa.id=tpd.apply_id
+		LEFT JOIN bm_project pro on tpa.project_id=pro.ID
+		where tpd.apply_id=#{id}
 			<if test="type!=null and type !=''">
-				and   type  like concat('%',#{type},'%')
+				and   tpd.type  like concat('%',#{type},'%')
 			</if>
 			<if test="name!=null and name !=''">
-				and   name like concat('%',#{name},'%')
+				and   tpd.name like concat('%',#{name},'%')
 			</if>
 			<if test="model!=null and model !=''">
-				and   module like concat('%',#{model},'%')
+				and   tpd.module like concat('%',#{model},'%')
 			</if>
-		ORDER BY id asc
+		ORDER BY tpd.id asc
 	</select>
 		<!-- 查询 工程集合-->
 	<select id="getProList" parameterType="com.bonus.gzgqj.business.plan.entity.PlanDevBean" resultType="com.bonus.gzgqj.business.plan.entity.PlanProBean">
@@ -177,21 +188,38 @@
 				ORDER BY TIME desc 
 	</select>
     <select id="getTypeList" resultType="com.bonus.gzgqj.business.plan.entity.PlanDevBean">
-		SELECT mt.ID id ,mt.PARENT_ID pId,mt.`LEVEL` level,mt.UNIT unit,mt.NUM num ,mt.`NAME`  name ,mt1.`NAME` pName ,
-			   mt2.`NAME` ppName,"" needNum,"" times,"" remarks
-		from mm_type  mt
-				 LEFT JOIN mm_type mt1 on mt.PARENT_ID=mt1.id   and mt1.IS_ACTIVE=1
-				 LEFT JOIN mm_type mt2 on mt1.PARENT_ID=mt2.id  and mt2.IS_ACTIVE=1
-		WHERE mt.IS_ACTIVE=1   and mt.`LEVEL`=4
-			<if test="name!=null and name !=''">
-				and   mt.name like concat('%',#{name},'%')
-			</if>
-			<if test="pName!=null and pName !=''">
-				and   mt1.name like concat('%',#{pName},'%')
-			</if>
-			<if test="ppName!=null and ppName !=''">
-				and   mt2.name like concat('%',#{ppName},'%')
-			</if>
+		SELECT mt.ID id ,mt.PARENT_ID pId,mt.`LEVEL` level,mt.UNIT unit,mt.NUM num ,mt.`NAME` name ,mt1.`NAME` pName ,
+		mt2.`NAME` ppName,"" needNum,"" times,"" remarks
+		from mm_type mt
+		LEFT JOIN mm_type mt1 on mt.PARENT_ID=mt1.id and mt1.IS_ACTIVE=1
+		LEFT JOIN mm_type mt2 on mt1.PARENT_ID=mt2.id and mt2.IS_ACTIVE=1
+		WHERE mt.IS_ACTIVE=1
+		and mt.ID not in (
+		SELECT
+		ID
+		FROM
+		mm_type
+		WHERE
+		PARENT_ID IN (
+		SELECT
+		ID
+		FROM
+		mm_type
+		WHERE
+		PARENT_ID IN ( SELECT ID FROM mm_type WHERE PARENT_ID = ( SELECT ID FROM mm_type WHERE NAME = '外租资产类' AND
+		PARENT_ID = 0 AND LEVEL = 1 ) )
+		)
+		)
+		and mt.`LEVEL`=4
+		<if test="name!=null and name !=''">
+			and mt.name like concat('%',#{name},'%')
+		</if>
+		<if test="pName!=null and pName !=''">
+			and mt1.name like concat('%',#{pName},'%')
+		</if>
+		<if test="ppName!=null and ppName !=''">
+			and mt2.name like concat('%',#{ppName},'%')
+		</if>
 
 
 		ORDER BY mt.`NAME` desc