Pārlūkot izejas kodu

Merge branch 'test' of http://git.tjyourong.com.cn/ctop/adsp-cloud into test

huangxuechao 4 gadi atpakaļ
vecāks
revīzija
cbf48be597

+ 2 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/CwjsPolicyInfoMapper.java

@@ -18,6 +18,8 @@ public interface CwjsPolicyInfoMapper extends BaseMapper<CwjsPolicyInfo> {
 
     List<JSONObject> getAllSale();
 
+    List<JSONObject> getAllSaleAndMeidaManager();
+
     List<JSONObject> getAllSaleByUserId(String userId);
 
     void updatePolicyInfoById(CwjsPolicyInfo policyInfo);

+ 25 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/xml/CwjsPolicyInfoMapper.xml

@@ -55,6 +55,31 @@
 
     </select>
 
+    <!-- 查询所有销售和 媒介 -->
+    <select id="getAllSaleAndMeidaManager" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT t1.user_id AS 'id',
+	LEFT (t1.company_name, 2) AS 'companyName',
+	t3.role_name AS 'ruleName',
+	t1.user_name AS 'realname'
+        FROM
+            user_company t1
+            LEFT JOIN sys_user_role t2
+        ON t1.user_id = t2.user_id
+            LEFT JOIN sys_role t3 ON t2.role_id = t3.id
+        WHERE
+            t3.role_code IN (
+            'externalSale'
+            , 'saleDirector'
+            , 'sale'
+            , 'saleAssistant'
+            , 'salesSupportManager'
+            , 'saleAm'
+            ,'admin'
+            ,'meidaManager'
+            )
+
+    </select>
+
     <select id="getAllSaleByUserId" resultType="com.alibaba.fastjson.JSONObject">
         SELECT distinct t1.create_user_id AS 'userId',
 	           t1.create_user_name AS 'userName'

+ 1 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/ICwjsPolicyInfoService.java

@@ -18,6 +18,7 @@ public interface ICwjsPolicyInfoService extends IService<CwjsPolicyInfo> {
     List<CwjsPolicyInfo> queryPageList(CwjsPolicyInfo policyInfo);
 
     List<JSONObject> getAllSale();
+    List<JSONObject> getAllSaleAndMeidaManager();
 
     List<JSONObject> getAllSaleByUserId(String userId);
 

+ 5 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/impl/CwjsPolicyInfoServiceImpl.java

@@ -71,6 +71,11 @@ public class CwjsPolicyInfoServiceImpl extends ServiceImpl<CwjsPolicyInfoMapper,
     }
 
     @Override
+    public List<JSONObject> getAllSaleAndMeidaManager(){
+        return policyInfoMapper.getAllSaleAndMeidaManager();
+    }
+
+    @Override
     public List<JSONObject> getAllSaleByUserId(String userId){
         return policyInfoMapper.getAllSaleByUserId(userId);
     }

+ 44 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/controller/SettlementController.java

@@ -1,8 +1,12 @@
 package org.jeecg.ctop.finance.settlement.controller;
 
+import cn.com.ctop.common.module.service.impl.SysUserServiceImpl;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.checker.units.qual.A;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.ctop.finance.policy.mapper.CwjsPolicyInfoMapper;
+import org.jeecg.ctop.finance.policy.service.impl.CwjsPolicyInfoServiceImpl;
 import org.jeecg.ctop.finance.policy.utils.Check;
 import org.jeecg.ctop.finance.settlement.entity.pojo.ctopCwjsSettlementInfo;
 
@@ -15,6 +19,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 
@@ -78,7 +84,6 @@ public class SettlementController {
     @ApiOperation(value="财务结算-上传账户", notes="财务结算-上传账户")
     @PostMapping("/settlementAccountImport")
     public Result settlementAccountImport(ctopCwjsSettlementInfo settlementInfo,@RequestParam("file") MultipartFile files) {
-
         if (files.isEmpty()){
             return Result.errorMsg("附件不能为空!");
         }
@@ -86,4 +91,42 @@ public class SettlementController {
     }
 
 
+    @Autowired
+    private CwjsPolicyInfoServiceImpl cwjsPolicyInfoService;
+
+
+    @ApiOperation(value="财务结算-获取负责人下拉列表", notes="财务结算-获取负责人下拉列表")
+    @GetMapping("/getResponsibleUserByIds")
+    public Result getResponsibleUserByIds(@RequestParam("userId") String userId) {
+        //查询用户角色
+        String roleCode = sysRoleService.getRoleCodeByUserId(userId);
+        //普通用户
+        Set<String> ids = new HashSet<String>(){{
+            add(userId);
+        }};
+        if ("admin".equals(roleCode)){
+            //查询所有销售 && 媒介
+            List allSaleList = cwjsPolicyInfoService.getAllSaleAndMeidaManager();
+            return Result.successMsg("查询所有销售和媒介用户。",allSaleList);
+
+        }else if ("saleDirector".equals(roleCode) || //销售总监
+                "kuaishou_operations_director".equals(roleCode) || //快手运营总监
+                "toutiao_operations_manager".equals(roleCode) || // 头条运营经理
+                "externalOperationManager".equals(roleCode) || //外部运营经理
+                "genera_manager_of_operations".equals(roleCode) || //运营总经理
+                "toutiao_operations_director".equals(roleCode) || //头条运营总监
+                "kuaishou_operations_manager".equals(roleCode) //快手运营经理
+         ){
+            //查询所有包含自己的下级
+            ids = materialReportOverViewService.recursiveQuerySubordinate(userId);
+        }
+        List<Map<String,Object>> list = settlementInfoService.getUserByIds(ids);
+        return Result.successMsg("查询用户!",list);
+    }
+
+
+
+
+
+
 }

+ 9 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/SettlementInfoMapper.java

@@ -5,6 +5,8 @@ import io.lettuce.core.dynamic.annotation.Param;
 import org.jeecg.ctop.finance.settlement.entity.pojo.ctopCwjsSettlementInfo;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 
 /**
@@ -37,4 +39,11 @@ public interface SettlementInfoMapper extends BaseMapper<ctopCwjsSettlementInfo>
      */
     void deleteSettlementById(@Param("id") Long id);
 
+    /**
+     * 查询多个用户名称
+     * @param userIds
+     * @return
+     */
+    List<Map<String,Object>> getUserByIds(@Param("userIds") Set userIds);
+
 }

+ 25 - 3
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/xml/SettlementInfoMapper.xml

@@ -39,7 +39,7 @@
                 AND projectName like concat ('%',#{projectName},'%')
             </if>
             <if test="accountName !=null and accountName != ''">
-                AND accountName like concat ('%',#{accountName},'%')
+                AND account_name like concat ('%',#{accountName},'%')
             </if>
             <if test="createUserName !=null and createUserName != ''">
                 AND createUserName like concat ('%',#{createUserName},'%')
@@ -48,10 +48,10 @@
                 AND media_id = #{mediaId}
             </if>
             <if test="startTime !=null and startTime != ''">
-                AND create_time &gt;= #{startTime}
+                AND DATE_FORMAT(create_time,'%Y-%m-%d') &gt;= #{startTime}
             </if>
             <if test="endTime !=null and endTime != ''">
-                AND create_time &lt;= #{endTime}
+                AND DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= #{endTime}
             </if>
             <if test="userIds !=null and userIds != ''">
                 AND create_user_id in
@@ -61,6 +61,7 @@
                 </foreach>
             </if>
         </where>
+        ORDER BY create_time DESC
     </select>
 
     <!-- 修改财务结算账户状态 -->
@@ -82,4 +83,25 @@
 
 
 
+    <!-- 查询多个用户信息 -->
+    <select id="getUserByIds" resultType="java.util.LinkedHashMap">
+        SELECT
+            id,realname
+        from sys_user
+        where status = 1
+          and del_flag = 0
+
+              <if test="userIds !=null and userIds != ''">
+                  AND id in
+                  <foreach collection="userIds" item="item" separator=","
+                           open="(" close=")">
+                      #{item}
+                  </foreach>
+              </if>
+
+
+    </select>
+
+
+
 </mapper>

+ 5 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/ISettlementInfoService.java

@@ -7,6 +7,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 public interface ISettlementInfoService extends IService<ctopCwjsSettlementInfo> {
 
@@ -18,4 +20,7 @@ public interface ISettlementInfoService extends IService<ctopCwjsSettlementInfo>
 
     Result settlementAccountImport(ctopCwjsSettlementInfo settlementInfo,MultipartFile file);
 
+
+    List<Map<String,Object>> getUserByIds(Set userIds);
+
 }

+ 20 - 4
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/serviceImpl/SettlementInfoServiceImpl.java

@@ -21,7 +21,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 
 @Slf4j
@@ -93,15 +96,13 @@ public class SettlementInfoServiceImpl extends ServiceImpl<SettlementInfoMapper,
 
             try {
                 LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-                //settlementInfo.setCreateUserId(user.getId());
-                settlementInfo.setCreateUserId("b161b7d9793942f980dbfe8c931cd1b0");
+                settlementInfo.setCreateUserId(user.getId());
+                //settlementInfo.setCreateUserId("b161b7d9793942f980dbfe8c931cd1b0");
                 ImportParams importParams = new ImportParams();
                 //表格标题行数
                 importParams.setTitleRows(1);
                 //表头行数
                 importParams.setHeadRows(1);
-                //校验数据
-                importParams.setNeedVerfiy(true);
 
                 //校验表头 头条
                 if (StringUtils.equals("1",String.valueOf(settlementInfo.getMediaId()))){
@@ -110,6 +111,7 @@ public class SettlementInfoServiceImpl extends ServiceImpl<SettlementInfoMapper,
                 }else if (StringUtils.equals("2",String.valueOf(settlementInfo.getMediaId()))){
                     importParams.setImportFields(new String[]{"快手ID","账户ID","账户名称"});
                 }
+                //校验excel的标题列顺序
                 importParams.setNeedCheckOrder(true);
                 ExcelImportResult<AccountImportVo> importResult = ExcelImportUtil.importExcelMore(file.getInputStream(), AccountImportVo.class,importParams);
                 if (importResult.getList().size() < 1){
@@ -127,4 +129,18 @@ public class SettlementInfoServiceImpl extends ServiceImpl<SettlementInfoMapper,
             return Result.successMsg("账户数据上传成功。",null);
         }
 
+
+    /**
+     *
+     * @description: 查询多个用户信息
+     *
+     * @param userIds
+     * @return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     * @author: zianY
+     */
+    @Override
+    public List<Map<String,Object>> getUserByIds(Set userIds) {
+        return settlementInfoMapper.getUserByIds(userIds);
+    }
+
 }

+ 6 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java

@@ -234,6 +234,12 @@ public class ProjectController {
         if (!Check.isNull(projectName)) {
             queryWrapper.like("project_name", projectName);
         }
+
+        //媒体类型 1、3 头条   2、4 快手
+        if (!Check.isNull(project.getMediaId())){
+            queryWrapper.in("media_id",Arrays.asList(project.getMediaId().split(",")));
+        }
+
         queryWrapper.orderByDesc("create_time");
         IPage<Project> pageList = projectService.page(page, queryWrapper);
         List<Project> records = pageList.getRecords();