Merge remote-tracking branch 'origin/master'

# Conflicts:
#	module_kzks/src/main/java/org/jeecg/modules/Index/controller/IndexController.java
#	module_kzks/src/main/java/org/jeecg/modules/Index/service/IndexService.java
#	module_kzks/src/main/java/org/jeecg/modules/Index/service/impl/IndexServiceImpl.java

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java

@@ -102,4 +102,13 @@ public interface SysDepartMapper extends BaseMapper<SysDepart> {
 
 	@Select("select depart_name from sys_depart where id in (select dep_id from sys_user_depart where user_id = #{userId})")
 	List<String>  getSysUserOfDepartNameList(String userId);
+    List<SysDepart> selectDepartByIds(ArrayList<String> ids);
+
+	/**
+	 * 根据id获取部门名称
+	 * @param id
+	 * @return
+	 */
+	@Select("SELECT depart_name FROM sys_depart where id=#{id}")
+	String getDepNameById(String id);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java

@@ -13,6 +13,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author: jeecg-boot
  */
 public interface SysUserDepartMapper extends BaseMapper<SysUserDepart>{
+	/**
+	 * 通过用户id查询部门id
+	 * @param userId 用户id
+	 * @return List<String>
+	 */
+	List<String> getUserDepartIdByUid(String userId);
+
 
     /**
      * 通过用户id查询部门用户
@@ -47,4 +54,9 @@ public interface SysUserDepartMapper extends BaseMapper<SysUserDepart>{
      * @return
      */
     IPage<SysUser> getUserInformation(Page<SysUser> page,  @Param("orgCode") String orgCode,  @Param("keyword") String keyword,@Param("userId") String userId);
+
+
+
+
+
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml

@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.system.mapper.SysUserDepartMapper">
+	<select id="getUserDepartIdByUid" parameterType="String" resultType="String">
+		SELECT dep_id
+		FROM sys_user_depart
+		WHERE user_id = #{userId, jdbcType=VARCHAR}
+	</select>
+
     <select id="getUserDepartByUid" parameterType="String" resultType="org.jeecg.modules.system.entity.SysUserDepart">
 		SELECT *
 		FROM sys_user_depart

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java

@@ -170,6 +170,15 @@ public interface ISysDepartService extends IService<SysDepart>{
      */
     void updateStatus(Date startDate, Date endDate);
 
+    List<SysDepart> selectDepartByIds(ArrayList<String> ids);
+
     String saveDepartDateAndReturnOrgCode(SysDepart sysDepart, String username);
 
+
+    /**
+     * 根据id获取部门名称
+     * @param id
+     * @return
+     */
+    String getDepNameById(String id);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java

@@ -4,6 +4,7 @@ package org.jeecg.modules.system.service;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.entity.SysUserDepart;
 import org.jeecg.modules.system.model.DepartIdModel;
@@ -64,4 +65,13 @@ public interface ISysUserDepartService extends IService<SysUserDepart> {
      * @return
      */
     IPage<SysUser> getUserInformation(String departId, String keyword, Integer pageSize, Integer pageNo);
+
+
+
+	/**
+	 * 通过用户id查询部门id
+	 * @param userId 用户id
+	 * @return List<String>
+	 */
+	List<String> getUserDepartIdByUid(@Param("userId") String userId);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java

@@ -205,7 +205,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 		return null;
 	}
 
-    /**
+	/**
 	 * saveDepartData 的调用方法,生成部门编码和部门类型（作废逻辑）
 	 * @deprecated
 	 * @param parentId
@@ -815,4 +815,19 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
     }
     //update-end---author:wangshuai ---date:20200308  for：[JTC-119]在部门管理菜单下设置部门负责人，新增方法添加部门负责人、删除负责部门负责人、查询部门对应的负责人
 
+
+	@Override
+	public List<SysDepart> selectDepartByIds(ArrayList<String> ids) {
+		return sysDepartMapper.selectDepartByIds(ids);
+	}
+
+	/**
+	 * 根据id获取部门名称
+	 * @param id
+	 * @return
+	 */
+	public String getDepNameById(String id){
+		return sysDepartMapper.getDepNameById(id);
+	}
+
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.ibatis.annotations.Param;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.vo.LoginUser;
@@ -39,7 +40,9 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
 	private ISysDepartService sysDepartService;
 	@Autowired
 	private SysUserMapper sysUserMapper;
-	
+
+	@Autowired
+	private SysUserDepartMapper sysUserDepartMapper;
 
 	/**
 	 * 根据用户id查询部门信息
@@ -216,4 +219,13 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
 		return res;
 	}
 
+
+	/**
+	 * 通过用户id查询部门id
+	 * @param userId 用户id
+	 * @return List<String>
+	 */
+	public List<String> getUserDepartIdByUid(String userId){
+		return sysUserDepartMapper.getUserDepartIdByUid(userId);
+	}
 }

module_kzks/src/main/java/org/jeecg/dataSync/task/DepartDataSync.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.TypeReference;
 import org.apache.commons.lang3.ObjectUtils;
 import org.jeecg.config.sign.util.HttpUtils;
-import org.jeecg.dataSync.config.HrConfigurer;
+import org.jeecg.dataSync.util.config.HrConfigurer;
 import org.jeecg.dataSync.util.WebServiceUtil;
 import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.service.ISysDepartService;

module_kzks/src/main/java/org/jeecg/modules/Index/mapper/xml/IndexMapper.xml

@@ -2,4 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.Index.mapper.IndexMapper">
 
+
+
+
+
+
+
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/costModelWxRepeat/controller/CostModelWxRepeatController.java

@@ -222,8 +222,7 @@ public class CostModelWxRepeatController extends JeecgController<CostModelWxRepe
 			 }
 
 		 }
-
-		 return Result.OK("111");
+		 return Result.OK("操作完成！");
 
 
 

module_kzks/src/main/java/org/jeecg/modules/kyTaskInfo/mapper/KyTaskInfoMapper.java

@@ -1,9 +1,14 @@
 package org.jeecg.modules.kyTaskInfo.mapper;
 
+import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.kyTaskInfo.entity.KyTaskInfo;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * @Description: ky_task_info
  * @Author: jeecg-boot
@@ -16,4 +21,19 @@ public interface KyTaskInfoMapper extends BaseMapper<KyTaskInfo> {
     @Select("select * from ky_task_info where taskno = #{taskno}")
     public KyTaskInfo getKyTaskInfoByTaskno(String taskno);
 
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按年查询*/
+    public List<String> getKyTaskNoByNameCurrYear(String depName);
+
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按上一年查询*/
+    public List<String> getKyTaskNoByNameLastYear(String depName);
+
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按当月查询*/
+    public List<String> getKyTaskNoByNameCurrMonth(String depName);
+
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按上个月查询*/
+    public List<String> getKyTaskNoByNameLastMonth(String depName);
+
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按去年同期月份查询*/
+    public List<String> getKyTaskNoByNameTqMonth(String depName);
+
 }

module_kzks/src/main/java/org/jeecg/modules/kyTaskInfo/mapper/xml/KyTaskInfoMapper.xml

@@ -1,5 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.kyTaskInfo.mapper.KyTaskInfoMapper">
+    <!--根据部门和实际完成时间 当年-->
+    <select id="getKyTaskNoByNameCurrYear" parameterType="String" resultType="String">
+        select taskno from ky_task_info
+        <where>
+            <if test="depName!=null and depName!=''">
+                and (zrbm=#{depName} or jycs=#{depName}) and (DATE(sjwcsj) BETWEEN CONCAT(YEAR(NOW()), '-01-01') AND NOW())
+            </if>
+        </where>
+    </select>
+    <!--根据部门和实际完成时间  上一年-->
+    <select id="getKyTaskNoByNameLastYear" parameterType="String" resultType="String">
+        select taskno from ky_task_info
+        <where>
+            <if test="depName!=null and depName!=''">
+                and (zrbm=#{depName} or jycs=#{depName}) and (DATE(sjwcsj) BETWEEN CONCAT(YEAR(DATE_SUB(NOW(), INTERVAL 1 YEAR)), '-01-01') AND DATE_SUB(NOW(), INTERVAL 1 YEAR))
+            </if>
+        </where>
+    </select>
+    <!--根据部门和实际完成时间  当月-->
+    <select id="getKyTaskNoByNameCurrMonth" parameterType="String" resultType="String">
+        select taskno from ky_task_info
+        <where>
+            <if test="depName!=null and depName!=''">
+                and (zrbm=#{depName} or jycs=#{depName}) and (DATE(sjwcsj) BETWEEN CONCAT(YEAR(NOW()), '-', Month(NOW()), '-01') AND NOW())
+            </if>
+        </where>
+    </select>
+    <!--根据部门和实际完成时间  上个月-->
+    <select id="getKyTaskNoByNameLastMonth" parameterType="String" resultType="String">
+        select taskno from ky_task_info
+        <where>
+            <if test="depName!=null and depName!=''">
+                and (zrbm=#{depName} or jycs=#{depName}) and (DATE(sjwcsj) BETWEEN CONCAT(YEAR(NOW()), '-', Month(NOW())-1, '-01') AND DATE_SUB(NOW(), INTERVAL 1 MONTH))
+            </if>
+        </where>
+    </select>
+    <!--根据部门和实际完成时间  去年同期月份-->
+    <select id="getKyTaskNoByNameTqMonth" parameterType="String" resultType="String">
+        select taskno from ky_task_info
+        <where>
+            <if test="depName!=null and depName!=''">
+                and (zrbm=#{depName} or jycs=#{depName}) and (DATE(sjwcsj) BETWEEN CONCAT(YEAR(NOW())-1, '-', Month(NOW()), '-01') AND DATE_SUB(NOW(), INTERVAL 1 YEAR))
+            </if>
+        </where>
+    </select>
+
+
 
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/kyTaskInfo/service/IKyTaskInfoService.java

@@ -1,8 +1,11 @@
 package org.jeecg.modules.kyTaskInfo.service;
 
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.kyTaskInfo.entity.KyTaskInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * @Description: ky_task_info
  * @Author: jeecg-boot
@@ -14,4 +17,14 @@ public interface IKyTaskInfoService extends IService<KyTaskInfo> {
     /**根据任务号查科研任务的业务员和下达部门*/
     public KyTaskInfo getKyTaskInfoByTaskno(String taskno);
 
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按年查询*/
+    public List<String> getKyTaskNoByNameCurrYear(String depName);
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按上一年年查询*/
+    public List<String> getKyTaskNoByNameLastYear(String depName);
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按当月查询*/
+    public List<String> getKyTaskNoByNameCurrMonth(String depName);
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按上个月查询*/
+    public List<String> getKyTaskNoByNameLastMonth(String depName);
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按去年同期月份查询*/
+    public List<String> getKyTaskNoByNameTqMonth(String depName);
 }

module_kzks/src/main/java/org/jeecg/modules/kyTaskInfo/service/impl/KyTaskInfoServiceImpl.java

@@ -10,6 +10,8 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+
 /**
  * @Description: ky_task_info
  * @Author: jeecg-boot
@@ -29,4 +31,26 @@ public class KyTaskInfoServiceImpl extends ServiceImpl<KyTaskInfoMapper, KyTaskI
         return kyTaskInfoMapper.getKyTaskInfoByTaskno(taskno);
     }
 
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按年查询*/
+    public List<String> getKyTaskNoByNameCurrYear(String depName){
+        return kyTaskInfoMapper.getKyTaskNoByNameCurrYear(depName);
+    }
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按上一年年查询*/
+    public List<String> getKyTaskNoByNameLastYear(String depName){
+        return kyTaskInfoMapper.getKyTaskNoByNameLastYear(depName);
+    }
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按当月查询*/
+    public List<String> getKyTaskNoByNameCurrMonth(String depName){
+        return kyTaskInfoMapper.getKyTaskNoByNameCurrMonth(depName);
+    }
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按上个月查询*/
+    public List<String> getKyTaskNoByNameLastMonth(String depName){
+        return kyTaskInfoMapper.getKyTaskNoByNameLastMonth(depName);
+    }
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按去年同期月份查询*/
+    public List<String> getKyTaskNoByNameTqMonth(String depName){
+        return kyTaskInfoMapper.getKyTaskNoByNameTqMonth(depName);
+    }
+
+
 }

module_kzks/src/main/java/org/jeecg/modules/projectCost/mapper/ProjectCostMapper.java

@@ -29,6 +29,10 @@ public interface ProjectCostMapper extends BaseMapper<ProjectCost> {
      */
     public List<ProjectCost> compareListByIds(@Param("ids") List<String> ids);
 
+    /**根据任务号查询项目成本中的相应数据*/
+    @Select("select * from kzks_project_cost where taskno=#{taskno}")
+    public List<ProjectCost> costListByTaskNo(@Param("taskno")String taskno);
+
     List<String>  queryZrbmTasknoListbydepartNames(@Param("departNames") List<String>  departNames);
 
     List<String>  queryXdbmTasknoListbydepartNames(@Param("departNames") List<String>  departNames);

module_kzks/src/main/java/org/jeecg/modules/projectCost/service/IProjectCostService.java

@@ -34,4 +34,7 @@ public interface IProjectCostService extends IService<ProjectCost> {
     public List<ProjectCost> compareListByIds(List<String> ids);
 
 
+    /**根据任务号查询项目成本中的相应数据*/
+    public List<ProjectCost> costListByTaskNo(String taskno);
+
 }

module_kzks/src/main/java/org/jeecg/modules/projectCost/service/impl/ProjectCostServiceImpl.java

@@ -68,4 +68,14 @@ public class ProjectCostServiceImpl extends ServiceImpl<ProjectCostMapper, Proje
         return projectCostMapper.compareListByIds(ids);
     }
 
+    /**根据任务号查询项目成本中的相应数据*/
+    public List<ProjectCost> costListByTaskNo(String taskno){
+        return projectCostMapper.costListByTaskNo(taskno);
+    }
+
+
+
+
+
+
 }