Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/InspectionItemPlan.java

@@ -46,6 +46,12 @@ public class InspectionItemPlan {
     private Date planEnd;
 
     /**
+     * 分部id
+     */
+    @ApiModelProperty(value = "分部id")
+    private Integer organId;
+
+    /**
      * 合作单位id
      */
     @ApiModelProperty(value = "合作单位id")
@@ -99,6 +105,9 @@ public class InspectionItemPlan {
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
 
+    @ApiModelProperty(value = "分部")
+    private String organName;
+
     @ApiModelProperty(value = "合作单位")
     private String cooperationName;
 
@@ -156,6 +165,14 @@ public class InspectionItemPlan {
         this.planEnd = planEnd;
     }
 
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(Integer organId) {
+        this.organId = organId;
+    }
+
     public Integer getCooperationOrganId() {
         return cooperationOrganId;
     }
@@ -251,4 +268,12 @@ public class InspectionItemPlan {
     public void setLastCheckItem(Integer lastCheckItem) {
         this.lastCheckItem = lastCheckItem;
     }
+
+    public String getOrganName() {
+        return organName;
+    }
+
+    public void setOrganName(String organName) {
+        this.organName = organName;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/InspectionItemPlanQueryInfo.java

@@ -10,6 +10,15 @@ public class InspectionItemPlanQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "itemId",required = false)
     private Long itemId;
 
+    @ApiModelProperty(value = "分部ids",required = false)
+    private String organId;
+
+    @ApiModelProperty(value = "合作单位id",required = false)
+    private Integer cooperationOrganId;
+
+    @ApiModelProperty(value = "乐团id",required = false)
+    private String musicGroupId;
+
     @ApiModelProperty(value = "乐团主管id",required = false)
     private Integer userId;
 
@@ -70,4 +79,28 @@ public class InspectionItemPlanQueryInfo extends QueryInfo {
     public void setMonth(Date month) {
         this.month = month;
     }
+
+    public String getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(String organId) {
+        this.organId = organId;
+    }
+
+    public Integer getCooperationOrganId() {
+        return cooperationOrganId;
+    }
+
+    public void setCooperationOrganId(Integer cooperationOrganId) {
+        this.cooperationOrganId = cooperationOrganId;
+    }
+
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public void setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/FinancialExpenditureServiceImpl.java

@@ -18,8 +18,9 @@ import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
-import com.ym.mec.util.excel.IniFileUtil;
 import com.ym.mec.util.excel.POIUtil;
+import com.ym.mec.util.ini.IniFileUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

mec-biz/src/main/java/com/ym/mec/biz/service/impl/GoodsServiceImpl.java

@@ -56,8 +56,8 @@ import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
-import com.ym.mec.util.excel.IniFileUtil;
 import com.ym.mec.util.excel.POIUtil;
+import com.ym.mec.util.ini.IniFileUtil;
 
 @Service
 public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implements GoodsService {

mec-biz/src/main/java/com/ym/mec/biz/service/impl/InspectionItemPlanConclusionServiceImpl.java

@@ -100,8 +100,7 @@ public class InspectionItemPlanConclusionServiceImpl extends BaseServiceImpl<Lon
     @Override
     public Map<Integer, List<InspectionItemPlanConclusion>> getInfo(Long planId, Integer checkItem) {
         List<InspectionItemPlanConclusion> conclusions = inspectionItemPlanConclusionDao.getInspectionItemPlanConclusion(planId, checkItem);
-        Map<Integer, List<InspectionItemPlanConclusion>> conclusionMap = conclusions.stream().collect(Collectors.groupingBy(InspectionItemPlanConclusion::getCheckItem));
-        return conclusionMap;
+        return conclusions.stream().collect(Collectors.groupingBy(InspectionItemPlanConclusion::getCheckItem));
     }
 
     @Override

mec-biz/src/main/java/com/ym/mec/biz/service/impl/InspectionItemPlanServiceImpl.java

@@ -82,6 +82,7 @@ public class InspectionItemPlanServiceImpl extends BaseServiceImpl<Long, Inspect
         //获取乐团教学点的GPS信息
         School school = musicGroupDao.getMusicGroupSchool(inspectionItemPlan.getMusicGroupId());
 
+        inspectionItemPlan.setOrganId(inspectionItem.getOrganId());
         inspectionItemPlan.setInspectionId(inspectionItem.getInspectionId());
         inspectionItemPlan.setSchoolGps(school.getLongitudeLatitude());
         inspectionItemPlan.setSubmitedGps("");
@@ -121,13 +122,14 @@ public class InspectionItemPlanServiceImpl extends BaseServiceImpl<Long, Inspect
             throw new BizException("日程时间不能晚于工作周期结束时间");
         }
         //获取乐团教学点的GPS信息
-        School school = musicGroupDao.getMusicGroupSchool(inspectionItemPlan.getMusicGroupId());
-
-        inspectionItemPlan.setInspectionId(inspectionItem.getInspectionId());
-        inspectionItemPlan.setSchoolGps(school.getLongitudeLatitude());
-        inspectionItemPlan.setSubmitedGps("");
-        inspectionItemPlan.setMemo("");
-        inspectionItemPlan.setStatus(0);
+        if (oldPlan.getStatus().equals(0)) { //未提交的修改
+            School school = musicGroupDao.getMusicGroupSchool(inspectionItemPlan.getMusicGroupId());
+            inspectionItemPlan.setInspectionId(inspectionItem.getInspectionId());
+            inspectionItemPlan.setSchoolGps(school.getLongitudeLatitude());
+            inspectionItemPlan.setSubmitedGps("");
+            inspectionItemPlan.setMemo("");
+            inspectionItemPlan.setStatus(0);
+        }
         inspectionItemPlan.setUpdateTime(nowDate);
         inspectionItemPlanDao.update(inspectionItemPlan);
         return inspectionItemPlan;

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentRouteOrderServiceImpl.java

@@ -15,8 +15,9 @@ import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.util.date.DateUtil;
-import com.ym.mec.util.excel.IniFileUtil;
 import com.ym.mec.util.excel.POIUtil;
+import com.ym.mec.util.ini.IniFileUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
@@ -39,6 +40,7 @@ import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
+
 import org.springframework.web.multipart.MultipartFile;
 
 @Service

mec-biz/src/main/resources/config/mybatis/InspectionItemPlanMapper.xml

@@ -10,6 +10,7 @@
         <result column="user_id_" property="userId"/>
         <result column="plan_start_" property="planStart"/>
         <result column="plan_end_" property="planEnd"/>
+        <result column="organ_id_" property="organId"/>
         <result column="cooperation_organ_id_" property="cooperationOrganId"/>
         <result column="music_group_id_" property="musicGroupId"/>
         <result column="school_gps_" property="schoolGps"/>
@@ -21,10 +22,11 @@
         <result column="update_time_" property="updateTime"/>
         <result column="cooperationName" property="cooperationName"/>
         <result column="musicGroupName" property="musicGroupName"/>
+        <result column="organName" property="organName"/>
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
-        id_, inspection_id_, item_id_, user_id_, plan_start_, plan_end_, cooperation_organ_id_,
+        id_, inspection_id_, item_id_, user_id_, plan_start_, plan_end_,organ_id_, cooperation_organ_id_,
         music_group_id_, school_gps_, submited_gps_, submited_time_, memo_, status_, create_time_,
         update_time_
     </sql>
@@ -44,10 +46,10 @@
             useGeneratedKeys="true">
         <!--@mbg.generated-->
         insert into inspection_item_plan (inspection_id_, item_id_, user_id_, plan_start_, plan_end_,
-        cooperation_organ_id_,
+        organ_id_,cooperation_organ_id_,
         music_group_id_, school_gps_, submited_gps_, submited_time_, memo_, status_,
         create_time_, update_time_)
-        values (#{inspectionId}, #{itemId}, #{userId}, #{planStart}, #{planEnd}, #{cooperationOrganId},
+        values (#{inspectionId}, #{itemId}, #{userId}, #{planStart}, #{planEnd}, #{organId},#{cooperationOrganId},
         #{musicGroupId}, #{schoolGps}, #{submitedGps}, #{submitedTime}, #{memo}, #{status},
         #{createTime}, #{updateTime})
     </insert>
@@ -70,6 +72,9 @@
             <if test="planEnd != null">
                 plan_end_ = #{planEnd},
             </if>
+            <if test="organId != null">
+                organ_id_ = #{organId},
+            </if>
             <if test="cooperationOrganId != null">
                 cooperation_organ_id_ = #{cooperationOrganId},
             </if>
@@ -103,7 +108,8 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="InspectionItemPlan" parameterType="map">
-        SELECT iip.*,co.name_ cooperationName,mg.name_ musicGroupName FROM inspection_item_plan iip
+        SELECT iip.*,o.name_ organName,co.name_ cooperationName,mg.name_ musicGroupName FROM inspection_item_plan iip
+        LEFT JOIN organization o ON o.id_=iip.organ_id_
         LEFT JOIN cooperation_organ co ON co.id_=iip.cooperation_organ_id_
         LEFT JOIN music_group mg ON mg.id_ = iip.music_group_id_
         <include refid="queryPageSql"/>
@@ -126,6 +132,15 @@
             <if test="userId != null">
                 AND iip.user_id_ = #{userId}
             </if>
+            <if test="organId != null">
+                AND FIND_IN_SET(iip.organ_id_,#{organId})
+            </if>
+            <if test="cooperationOrganId != null">
+                AND iip.cooperation_organ_id_ = #{cooperationOrganId}
+            </if>
+            <if test="musicGroupId != null">
+               AND iip.music_group_id_ = #{musicGroupId}
+            </if>
             <if test='hasSubmit != null and hasSubmit.toString()=="1".toString()'>
                 AND iip.status_ > 0
             </if>

mec-util/src/main/java/com/ym/mec/util/excel/IniFileEntity.java → mec-util/src/main/java/com/ym/mec/util/ini/IniFileEntity.java

@@ -1,4 +1,4 @@
-package com.ym.mec.util.excel;
+package com.ym.mec.util.ini;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 

mec-util/src/main/java/com/ym/mec/util/excel/IniFileUtil.java → mec-util/src/main/java/com/ym/mec/util/ini/IniFileUtil.java

@@ -1,4 +1,4 @@
-package com.ym.mec.util.excel;
+package com.ym.mec.util.ini;
 
 import com.ym.mec.util.exception.UtilException;
 import org.ini4j.Ini;

mec-web/src/main/java/com/ym/mec/web/controller/InspectionItemPlanController.java

@@ -2,6 +2,8 @@ package com.ym.mec.web.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.entity.Inspection;
 import com.ym.mec.biz.dal.entity.InspectionItemPlan;
 import com.ym.mec.biz.dal.page.InspectionItemPlanQueryInfo;
@@ -11,11 +13,13 @@ import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -27,6 +31,8 @@ public class InspectionItemPlanController extends BaseController {
     private InspectionItemPlanService inspectionItemPlanService;
     @Resource
     private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private EmployeeDao employeeDao;
 
     @ApiOperation(value = "添加巡查任务事项日程")
     @PostMapping("/add")
@@ -61,7 +67,22 @@ public class InspectionItemPlanController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        queryInfo.setUserId(sysUser.getId());
+        if (!sysUser.getIsSuperAdmin()) {
+            Employee employee = employeeDao.get(sysUser.getId());
+            if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+                queryInfo.setOrganId(employee.getOrganIdList());
+            } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
+                return failed("用户所在分部异常");
+            } else {
+                List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+                if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
+                    return failed("非法请求");
+                }
+            }
+        }
+        if (queryInfo.getItemId() != null) {
+            queryInfo.setUserId(sysUser.getId());
+        }
         return succeed(inspectionItemPlanService.queryPage(queryInfo));
     }
 }