Merge remote-tracking branch 'origin/demo_' into demo_

platform-dao/src/main/java/com/platform/dao/dto/longyanpurchaseorder/LongYanPurchaseOrderDTO.java

@@ -38,9 +38,6 @@ public class LongYanPurchaseOrderDTO extends BaseDTO implements Serializable {
     private String yongYouId;
     private String storeName;
     private String storePosition;
-//    private List<LongYanPurchaseDetailDTO> deleteDetails;
-//    private List<LongYanPurchaseDetailDTO> addDetails;
-//    private List<LongYanPurchaseDetailDTO> updateDetails;
     private String purchaseNo;
     private Integer status;
     private Integer oldOrNew;

platform-dao/src/main/java/com/platform/dao/dto/project/ProjectDTO.java

@@ -54,4 +54,6 @@ public class ProjectDTO extends BaseDTO implements Serializable {
      */
     private String parentId;
 
+    private String fzr;
+
 }

platform-dao/src/main/java/com/platform/dao/entity/project/Project.java

@@ -1,15 +1,10 @@
 package com.platform.dao.entity.project;
 
-import com.platform.common.bean.DataScope;
-import com.platform.dao.vo.sb.SbModelSpareBomVO;
 import lombok.Data;
 
 import javax.persistence.Id;
 import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  * @Description 部位信息实体类
@@ -47,5 +42,7 @@ public class Project implements Serializable {
      */
     private String parentId;
 
+    private String fzr;
+
 
 }

platform-dao/src/main/java/com/platform/dao/mapper/upms/SysUserRoleMapper.java

@@ -36,4 +36,6 @@ public interface SysUserRoleMapper extends MyMapper<SysUserRole> {
     List<SysUserRole> selectListByRoleAndUserStatus(@Param("roleId") String roleId, @Param("status") Integer status);
 
     List<SysUserRoleVO> selectRoleListByUserId(String userId);
+
+    String selectRoleName(String object);
 }

platform-dao/src/main/java/com/platform/dao/vo/query/project/ProjectVO.java

@@ -53,4 +53,6 @@ public class ProjectVO extends BaseVO implements Serializable {
      */
     private String parentId;
 
+    private String fzr;
+
 }

platform-dao/src/main/resources/mapper/project/ProjectMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.platform.dao.mapper.project.ProjectMapper">
     <sql id="Base_Column_List">
-        t1.id,  t1.no, t1.name,  t1.parent_id,t1.flag,
+        t1.id,  t1.no, t1.name,  t1.parent_id,t1.flag,t1.fzr as fzr,
         pt.name as parentName,t1.type,t1.remark,pt.no as parentNo,pt.flag as pFlag
     </sql>
 

platform-dao/src/main/resources/mapper/upms/SysUserRoleMapper.xml

@@ -28,4 +28,10 @@
         where u.user_id=#{userId}
     </select>
 
+    <select id="selectRoleName" parameterType="java.lang.Object" resultType="java.lang.String">
+        select role.role_name from t_sys_user_role ur join t_sys_role role on ur.role_id = role.role_id
+         where ur.user_id = #{value}
+         limit 1
+    </select>
+
 </mapper>

platform-rest/src/main/java/com/platform/rest/controller/project/ProjectController.java

@@ -41,7 +41,6 @@ public class ProjectController {
 
     private final ProjectService projectService;
 
-    private final SbTypeService sbTypeService;
     private final ProjectMapper projectMapper;
 
     /**
@@ -197,15 +196,15 @@ public class ProjectController {
         return new R<>(parentList);
     }
 
-//    /**
-//     * 获取列表
-//     *
-//     * @param sbTypeDTO 设备位置DTO
-//     * @return R
-//     */
-//    @GetMapping("/longYan")
-//    public R queryLongYan(ProjectDTO sbTypeDTO) {
-//        return new R<>(ProjectService.selectLongYanList(sbTypeDTO));
-//    }
+    /**
+     * 获取列表
+     *
+     * @return R
+     */
+    @GetMapping("/longYan/test/{type}")
+    public R queryLongYan(@PathVariable Integer type) {
+        projectService.handleExist(type);
+        return new R<>();
+    }
 
 }

platform-service/src/main/java/com/platform/service/project/ProjectService.java

@@ -40,4 +40,9 @@ public interface ProjectService extends IBaseService<Project, ProjectDTO> {
 
     List<ProjectVO> selectLongYanList(ProjectDTO dto);
 
+    /**
+     *
+     */
+    void handleExist(Integer type);
+
 }

platform-service/src/main/java/com/platform/service/project/impl/ProjectServiceImpl.java

@@ -1,6 +1,7 @@
 package com.platform.service.project.impl;
 
 import com.github.pagehelper.PageHelper;
+import com.platform.common.util.IdGeneratorUtils;
 import com.platform.dao.bean.MyVOPage;
 import com.platform.dao.dto.project.ProjectDTO;
 import com.platform.dao.dto.sb.SbTypeDTO;
@@ -19,6 +20,9 @@ import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
 
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -46,6 +50,25 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectMapper, Project,
         return mapper.selectLongYanList(dto);
     }
 
+    @Override
+    public void handleExist(Integer type) {
+        ProjectDTO querydto = new ProjectDTO();
+        querydto.setFlag(type);
+        String fileName = "C:\\Users\\Administrator\\Desktop\\menu.txt";
+        try (BufferedReader reader = new BufferedReader(new FileReader(fileName))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                querydto.setNo(line.trim());
+                int countNum = this.getCountByDTO(querydto);
+                if(countNum > 0){
+                    System.out.println("-------------------------"+line);
+                }
+            }
+        } catch (IOException e) {
+            System.out.println("Error reading file: " + e.getMessage());
+        }
+    }
+
     @Override
     public MyVOPage<ProjectVO> selectVOPage(ProjectDTO model, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);

platform-service/src/main/java/com/platform/service/upms/SysUserRoleService.java

@@ -61,4 +61,6 @@ public interface SysUserRoleService extends IBaseService<SysUserRole, SysUserRol
      * @return
      */
     String getRoleCodesByUserId();
+
+    String selectRoleName(String object);
 }

platform-service/src/main/java/com/platform/service/upms/impl/SysUserRoleServiceImpl.java

@@ -69,4 +69,9 @@ public class SysUserRoleServiceImpl extends BaseServiceImpl<SysUserRoleMapper, S
         });
         return roleCodes.toString();
     }
+
+    @Override
+    public String selectRoleName(String object) {
+        return mapper.selectRoleName(object);
+    }
 }

platform-service/src/main/java/com/platform/service/upms/impl/SysUserServiceImpl.java

@@ -48,6 +48,9 @@ import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
 
 import javax.annotation.Resource;
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -61,39 +64,39 @@ import java.util.stream.Collectors;
 @Slf4j
 public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser, SysUserDTO> implements SysUserService {
 
-    @Autowired
+    @Resource
     private SysRoleService sysRoleService;
 
-    @Autowired
+    @Resource
     private SysMenuService sysMenuService;
 
-    @Autowired
+    @Resource
     private SysUserRoleService sysUserRoleService;
 
-    @Autowired
+    @Resource
     private CacheManager cacheManager;
 
-    @Autowired
+    @Resource
     private RedisTemplate redisTemplate;
 
-    @Autowired
+    @Resource
     private SysUserDeptService sysUserDeptService;
 
-    @Autowired
+    @Resource
     private VerifyCodeService verifyCodeService;
 
-    @Autowired
+    @Resource
     private SysDeptRelationMapper sysDeptRelationMapper;
 
-    @Autowired
+    @Resource
     private SysDeptService sysDeptService;
-    @Autowired
+    @Resource
     private SysDeptMapper deptMapper;
 
-    @Autowired
+    @Resource
     private ActivitiBusinessService activitiBusinessService;
 
-    @Autowired
+    @Resource
     private SysDeptManagerMapper sysDeptManagerMapper;
 
     @Resource
@@ -492,7 +495,15 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser,
     public MyPage<SysUserVO> selectVOPageInfo(SysUserDTO record, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
         List<SysUserVO> sysUserDTOList = mapper.selectVOByKeyword(record);
-        return new MyPage<>(sysUserDTOList);
+        MyPage<SysUserVO> pageInfos = new MyPage<>(sysUserDTOList);
+        if(pageInfos != null && pageInfos.getRows() != null && pageInfos.getRows().size() > 0){
+            for(SysUserVO vo : pageInfos.getRows()){
+                // 获取部门和角色
+                vo.setRoleName(sysUserRoleService.selectRoleName(vo.getUserId()));
+                vo.setDeptName(sysDeptService.getModelById(vo.getDept()).getName());
+            }
+        }
+        return pageInfos;
     }
 
     @Override
@@ -845,4 +856,30 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser,
     public List<SysUserVO> getUserByRoleOrDept(SysUserDTO model) {
         return mapper.getRepairUsers(model);
     }
+
+    public static void main(String[] args) throws Exception{
+        String fileName = "C:\\Users\\Administrator\\Desktop\\menu.txt";
+        try (BufferedReader reader = new BufferedReader(new FileReader(fileName))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                String[] arr = line.split("\t");
+                StringBuilder sql = new StringBuilder();
+                sql.append("INSERT INTO `t_project` (id,no,name,parent_id,type,flag,fzr) VALUES ('");
+                sql.append(IdGeneratorUtils.getObjectId()).append("','");
+                sql.append(arr[0]).append("','");
+                sql.append(arr[1]).append("','");
+                sql.append("64d1aa12c4e0f44a08e34d28").append("','");
+                sql.append(2).append("',");
+                sql.append(1).append(",'");
+                if("空".equals(arr[4])){
+                    sql.append("');");
+                }else{
+                    sql.append(arr[4]).append("');");
+                }
+                System.out.println(sql.toString());
+            }
+        } catch (IOException e) {
+            System.out.println("Error reading file: " + e.getMessage());
+        }
+    }
 }

platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -20,6 +20,7 @@ import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
 import com.platform.dao.dto.store.SpareStoreDTO;
 import com.platform.dao.entity.longyanpurchaseorder.LongYanPurchaseDetail;
 import com.platform.dao.entity.longyanpurchaseorder.LongYanPurchaseOrder;
+import com.platform.dao.entity.project.Project;
 import com.platform.dao.entity.repair.RepairApplicationForm;
 import com.platform.dao.entity.sb.SbInfo;
 import com.platform.dao.entity.sb.SbModelSpareBom;
@@ -29,6 +30,7 @@ import com.platform.dao.entity.store.OutStoreForm;
 import com.platform.dao.enums.*;
 import com.platform.dao.mapper.longyanpurchaseorder.LongYanPurchaseDetailMapper;
 import com.platform.dao.mapper.longyanpurchaseorder.LongYanPurchaseOrderMapper;
+import com.platform.dao.mapper.project.ProjectMapper;
 import com.platform.dao.mapper.repair.RepairApplicationFormMapper;
 import com.platform.dao.mapper.sb.SbInfoMapper;
 import com.platform.dao.mapper.sb.SbModelSpareBomMapper;
@@ -89,6 +91,8 @@ public class YongyouServiceImpl implements YongyouService {
     private LongYanPurchaseDetailMapper longYanPurchaseDetailMapper;
     @Resource
     private LongYanSpareAddMapper longYanSpareAddMapper;
+    @Resource
+    private ProjectMapper projectMapper;
     private String token_key = "yongyou-token";
     private String Conn_key = "yongyou-Conn";
     private String cAcc_ID_key = "yongyou-cAcc_ID";
@@ -641,18 +645,21 @@ public class YongyouServiceImpl implements YongyouService {
         LongYanPurchaseDetailDTO longYanPurchaseDetailDTO = new LongYanPurchaseDetailDTO();
         longYanPurchaseDetailDTO.setLongYangPurchaseOrderId(id);
         List<LongYanPurchaseDetailVO> detailVOS = longYanPurchaseDetailMapper.selectList(longYanPurchaseDetailDTO);
-
         if (vo.getSbId()!=null) {
             addBom(vo,detailVOS);
-
         }
-
         PuAppMain puAppMain = new PuAppMain();
-
         puAppMain.setCbustype(vo.getCbustype());
         puAppMain.setCdepcode(vo.getCdepcode());
         puAppMain.setCcode(vo.getPurchaseNo());
         puAppMain.setCdefine1(DictCache.getLabelByValue("LONG_YAN_PURCHASE_TYPE",vo.getType()));
+        // 获取项目信息
+        if(StringUtils.isNotBlank(vo.getProjectId())){
+            String fzr = projectMapper.selectByPrimaryKey(vo.getProjectId()).getFzr();
+            if(!StringUtils.isBlank(fzr) && !"无".equals(fzr)){
+                puAppMain.setCdefine3(fzr);
+            }
+        }
         if (vo.getSbId()!=null) {
             SbInfo sbInfo = sbInfoMapper.selectByPrimaryKey(vo.getSbId());
             puAppMain.setCdefine2(sbInfo.getPositionNo() + "-" + sbInfo.getName());
@@ -665,19 +672,13 @@ public class YongyouServiceImpl implements YongyouService {
         for (LongYanPurchaseDetailVO orderVO:detailVOS){
             PuAppDetail detail = new PuAppDetail();
             detail.setCinvcode(orderVO.getNo());
-//            detail.setIpertaxrate("0");
             detail.setFquantity(orderVO.getNum().intValue());
-//            detail.setDrequirdate(DateUtils.dateToString(LocalDateTime.now()));
-//            detail.setDarrivedate(DateUtils.dateToString(LocalDateTime.now()));
             detail.setDrequirdate(vo.getNeedDate().toString());
             detail.setDarrivedate(vo.getPlanGetDate().toString());
             detail.setCitem_class(orderVO.getProjectNo());
             detail.setCitemname(orderVO.getProjectName());
             detail.setCitem_name(orderVO.getProjectSecondName());
             detail.setCitemcode(orderVO.getProjectSecondNo());
-//            detail.setCexch_name("人名币");
-//            detail.setIexchrate("1");
-//            detail.setIvouchrowno("136345431");
             puAppDetails.add(detail);
         }
         PuAppVouch puAppVouch = new PuAppVouch();

platform-service/src/main/java/handler/yongyou/request/PuAppMain.java

@@ -20,9 +20,12 @@ public class PuAppMain{
     private String cmaker;//制单人
 
     private String cdefine1;//计划类型
+
     private String cdefine2;//设备
 
     private String cdefine11;//计划备注
 
+    private String cdefine3; // 项目负责人
+
 
 }