优化 巡检计划删除 巡检计划 员工表

Api/src/main/java/com/java110/api/listener/inspectionPlan/SaveInspectionPlanListener.java

@@ -34,7 +34,6 @@ public class SaveInspectionPlanListener extends AbstractServiceApiListener {
         Assert.hasKeyAndValue(reqJson, "inspectionPlanName", "必填，请填写巡检计划名称");
         Assert.hasKeyAndValue(reqJson, "inspectionRouteId", "必填，请填写巡检路线");
         Assert.hasKeyAndValue(reqJson, "inspectionPlanPeriod", "必填，请选择执行周期");
-        Assert.hasKeyAndValue(reqJson, "staffId", "必填，请填写执行人员");
         Assert.hasKeyAndValue(reqJson, "startTime", "必填，请选择计划开始时间");
         Assert.hasKeyAndValue(reqJson, "endTime", "必填，请选择结束时间");
         Assert.hasKeyAndValue(reqJson, "signType", "必填，请填写签到方式");

Api/src/main/java/com/java110/api/listener/inspectionPlan/UpdateInspectionPlanListener.java

@@ -32,7 +32,6 @@ public class UpdateInspectionPlanListener extends AbstractServiceApiListener {
         Assert.hasKeyAndValue(reqJson, "inspectionPlanName", "必填，请填写巡检计划名称");
         Assert.hasKeyAndValue(reqJson, "inspectionRouteId", "必填，请填写巡检路线");
         Assert.hasKeyAndValue(reqJson, "inspectionPlanPeriod", "必填，请选择执行周期");
-        Assert.hasKeyAndValue(reqJson, "staffId", "必填，请填写执行人员");
         Assert.hasKeyAndValue(reqJson, "startTime", "必填，请选择计划开始时间");
         Assert.hasKeyAndValue(reqJson, "endTime", "必填，请选择结束时间");
         Assert.hasKeyAndValue(reqJson, "signType", "必填，请填写签到方式");

CommunityService/src/main/java/com/java110/community/listener/inspectionPlan/AbstractInspectionPlanBusinessServiceDataFlowListener.java

@@ -51,8 +51,6 @@ public abstract class AbstractInspectionPlanBusinessServiceDataFlowListener exte
         businessInspectionPlanInfo.put("inspectionPlanId", businessInspectionPlanInfo.get("inspectionPlanId"));
         businessInspectionPlanInfo.put("state", businessInspectionPlanInfo.get("state"));
         businessInspectionPlanInfo.put("communityId", businessInspectionPlanInfo.get("communityId"));
-        businessInspectionPlanInfo.put("staffId", businessInspectionPlanInfo.get("staffId"));
-        businessInspectionPlanInfo.put("staffName", businessInspectionPlanInfo.get("staffName"));
         businessInspectionPlanInfo.remove("bId");
         businessInspectionPlanInfo.put("statusCd", statusCd);
     }
@@ -91,8 +89,6 @@ public abstract class AbstractInspectionPlanBusinessServiceDataFlowListener exte
         currentInspectionPlanInfo.put("inspectionPlanId", businessInspectionPlan.get("inspectionPlanId"));
         currentInspectionPlanInfo.put("state", businessInspectionPlan.get("state"));
         currentInspectionPlanInfo.put("communityId", businessInspectionPlan.get("communityId"));
-        currentInspectionPlanInfo.put("staffId", businessInspectionPlan.get("staffId"));
-        currentInspectionPlanInfo.put("staffName", businessInspectionPlan.get("staffName"));
         currentInspectionPlanInfo.put("operate", StatusConstant.OPERATE_DEL);
         getInspectionPlanServiceDaoImpl().saveBusinessInspectionPlanInfo(currentInspectionPlanInfo);
     }

FrontService/src/main/java/com/java110/front/smo/inspectionPlan/impl/AddInspectionPlanSMOImpl.java

@@ -32,7 +32,6 @@ public class AddInspectionPlanSMOImpl extends AbstractComponentSMO implements IA
         Assert.hasKeyAndValue(paramIn, "inspectionPlanName", "必填，请填写巡检计划名称");
         Assert.hasKeyAndValue(paramIn, "inspectionRouteId", "必填，请填写巡检路线");
         Assert.hasKeyAndValue(paramIn, "inspectionPlanPeriod", "必填，请选择执行周期");
-        Assert.hasKeyAndValue(paramIn, "staffId", "必填，请填写执行人员");
         Assert.hasKeyAndValue(paramIn, "startTime", "必填，请选择计划开始时间");
         Assert.hasKeyAndValue(paramIn, "endTime", "必填，请选择结束时间");
         Assert.hasKeyAndValue(paramIn, "signType", "必填，请填写签到方式");

FrontService/src/main/java/com/java110/front/smo/inspectionPlan/impl/EditInspectionPlanSMOImpl.java

@@ -31,7 +31,6 @@ public class EditInspectionPlanSMOImpl extends AbstractComponentSMO implements I
         Assert.hasKeyAndValue(paramIn, "inspectionPlanName", "必填，请填写巡检计划名称");
         Assert.hasKeyAndValue(paramIn, "inspectionRouteId", "必填，请填写巡检路线");
         Assert.hasKeyAndValue(paramIn, "inspectionPlanPeriod", "必填，请选择执行周期");
-        Assert.hasKeyAndValue(paramIn, "staffId", "必填，请填写执行人员");
         Assert.hasKeyAndValue(paramIn, "startTime", "必填，请选择计划开始时间");
         Assert.hasKeyAndValue(paramIn, "endTime", "必填，请选择结束时间");
         Assert.hasKeyAndValue(paramIn, "signType", "必填，请填写签到方式");

java110-db/src/main/resources/mapper/community/InspectionPlanServiceDaoImplMapper.xml

@@ -14,19 +14,17 @@
             remark,
             end_time,
             operate,
-            staff_name,
             sign_type,
             start_time,
             inspection_plan_id,
             state,
             community_id,
             b_id,
-            staff_id,
             create_user_id,
             create_user_name)
         values (#{inspectionPlanName},#{inspectionRouteId},#{inspectionPlanPeriod},#{remark},
-                #{endTime},#{operate},#{staffName},#{signType},#{startTime},
-                #{inspectionPlanId},#{state},#{communityId},#{bId},#{staffId},#{createUserId},
+                #{endTime},#{operate},#{signType},#{startTime},
+                #{inspectionPlanId},#{state},#{communityId},#{bId},#{createUserId},
                 #{createUserName})
        </insert>
 
@@ -38,10 +36,10 @@
             t.inspection_route_id inspectionRouteId,
             t.inspection_plan_period inspectionPlanPeriod,
             t.remark,t.end_time endTime,
-            t.operate,t.staff_name staffName,t.sign_type signType,
+            t.operate,t.sign_type signType,
             t.start_time startTime,t.create_user_id createUserId,
             t.inspection_plan_id inspectionPlanId,t.state,
-            t.community_id communityId,t.b_id bId,t.staff_id staffId
+            t.community_id communityId,t.b_id bId
         from business_inspection_plan t
         where 1 =1
         <if test="inspectionPlanName !=null and inspectionPlanName != ''">
@@ -62,9 +60,7 @@
         <if test="operate !=null and operate != ''">
             and t.operate= #{operate}
         </if>
-        <if test="staffName !=null and staffName != ''">
-            and t.staff_name= #{staffName}
-        </if>
+
         <if test="signType !=null and signType != ''">
             and t.sign_type= #{signType}
         </if>
@@ -86,9 +82,7 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
-        <if test="staffId !=null and staffId != ''">
-            and t.staff_id= #{staffId}
-        </if>
+
 
     </select>
 
@@ -100,12 +94,12 @@
             inspection_plan_name,inspection_route_id,
             inspection_plan_period,remark,status_cd,end_time,
             sign_type,start_time,create_user_id,create_user_name,
-            inspection_plan_id,state,community_id,b_id,staff_id,staff_name
+            inspection_plan_id,state,community_id,b_id
         ) select
         t.inspection_plan_name,t.inspection_route_id,t.inspection_plan_period,t.remark,'0',
         t.end_time,t.sign_type,t.start_time,t.create_user_id,t.create_user_name,
         t.inspection_plan_id,t.state,
-        t.community_id,t.b_id,t.staff_id,t.staff_name
+        t.community_id,t.b_id
         from business_inspection_plan t where 1=1
         <if test="inspectionPlanName !=null and inspectionPlanName != ''">
             and t.inspection_plan_name= #{inspectionPlanName}
@@ -123,9 +117,6 @@
             and t.end_time= #{endTime}
         </if>
         and t.operate= 'ADD'
-        <if test="staffName !=null and staffName != ''">
-            and t.staff_name= #{staffName}
-        </if>
         <if test="signType !=null and signType != ''">
             and t.sign_type= #{signType}
         </if>
@@ -147,9 +138,7 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
-        <if test="staffId !=null and staffId != ''">
-            and t.staff_id= #{staffId}
-        </if>
+
 
     </insert>
 
@@ -172,8 +161,6 @@
             t.state,
             t.community_id communityId,
             t.b_id bId,
-            t.staff_id staffId,
-            t.staff_name staffName,
             t.create_time createTime,
             d.name stateName,
             c.name inspectionPlanPeriodName,
@@ -199,9 +186,7 @@
         <if test="endTime !=null and endTime != ''">
             and t.end_time= #{endTime}
         </if>
-        <if test="staffName !=null and staffName != ''">
-            and t.staff_name= #{staffName}
-        </if>
+
         <if test="signType !=null and signType != ''">
             and t.sign_type= #{signType}
         </if>
@@ -223,9 +208,6 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
-        <if test="staffId !=null and staffId != ''">
-            and t.staff_id= #{staffId}
-        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -255,9 +237,7 @@
         <if test="endTime !=null">
             , t.end_time= #{endTime}
         </if>
-        <if test="staffName !=null and staffName != ''">
-            , t.staff_name= #{staffName}
-        </if>
+
         <if test="signType !=null and signType != ''">
             , t.sign_type= #{signType}
         </if>
@@ -270,9 +250,7 @@
         <if test="communityId !=null and communityId != ''">
             , t.community_id= #{communityId}
         </if>
-        <if test="staffId !=null and staffId != ''">
-            , t.staff_id= #{staffId}
-        </if>
+
         where 1=1
         <if test="inspectionPlanId !=null and inspectionPlanId != ''">
             and t.inspection_plan_id= #{inspectionPlanId}
@@ -306,9 +284,7 @@
         <if test="endTime !=null and endTime != ''">
             and t.end_time= #{endTime}
         </if>
-        <if test="staffName !=null and staffName != ''">
-            and t.staff_name= #{staffName}
-        </if>
+
         <if test="signType !=null and signType != ''">
             and t.sign_type= #{signType}
         </if>
@@ -327,9 +303,7 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
-        <if test="staffId !=null and staffId != ''">
-            and t.staff_id= #{staffId}
-        </if>
+
         <if test="keyWord !=null and keyWord != ''">
             and (t.inspection_plan_name like concat('%',#{keyWord},'%') or t.staff_name like concat('%',#{keyWord},'%'))
         </if>