财务、采购功能调整

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/CwProofreadDetailMapper.xml

@@ -45,7 +45,7 @@
 		select a.*,b.`name` AS type_name,b.sort from cw_proofread_detail a
 		left join cw_proofread_type b on a.type_id = b.id
 		where info_id = #{id}
-		ORDER BY a.create_time
+		ORDER BY a.create_time DESC
 	</select>
 	<select id="getByTypeIdAndInfoId" resultType="com.jeeplus.finance.projectReport.domain.CwProofreadDetail">
 		select * from cw_proofread_detail where type_id = #{typeId} and info_id = #{infoId}

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/collect/mapper/xml/CollectBasicsReturnHiMapper.xml

@@ -4,10 +4,10 @@
 
     <sql id="HI_Column_List">
         hi.id,
-        hi.create_by,
-        hi.create_date,
-        hi.update_by,
-        hi.update_date,
+        hi.create_by_id,
+        hi.create_time,
+        hi.update_by_id,
+        hi.update_time,
         hi.del_flag,
         hi.remarks,
         hi.collect_id,
@@ -23,7 +23,7 @@
         from material_management_collect_basics_return_hi hi
         left join sys_user su on su.id = hi.return_user
         where hi.del_flag = '0' and hi.collect_id = #{collectId}
-        order by hi.create_date desc
+        order by hi.create_time desc
     </select>
 
     <select id="findHiByHiId" resultType="com.jeeplus.pubmodules.collect.domain.CollectBasicsReturnHi">
@@ -38,7 +38,7 @@
         <include refid="HI_Column_List"></include>
         from material_management_collect_basics_return_hi hi
         where hi.del_flag = '0' and hi.collect_id = #{collectId}
-        order by hi.create_date desc
+        order by hi.create_time desc
         limit 1
     </select>
 </mapper>

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/wareHouse/mapper/WareHouseDetailedMapper.java

@@ -41,7 +41,7 @@ public interface WareHouseDetailedMapper extends BaseMapper<WareHouseDetailed> {
     void deleteByBasicId(String basicId);
 
     // 根据入库id删除关联附件  物理删除
-    void deleteFilesByIdList(List<String> attachmentIdList);
+    void deleteFilesByIdList(@Param("attachmentIdList")List<String> attachmentIdList);
 
     // 修改入库详情商品名称
     void saveTradeName(@Param("oldTradeName") String oldTradeName, @Param("tradeName") String tradeName, @Param("wareHouseType") String wareHouseType);

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/wareHouse/service/WareHouseBasicService.java

@@ -210,6 +210,7 @@ public class WareHouseBasicService {
         // 查询基础信息表
         WareHouseBasic info = basicMapper.selectById(id);
         BeanUtils.copyProperties(info, dto);
+        dto.setCreateBy(info.getCreateById());
         // 查询入库详情数据，只包含没有被修改过的数据以及修改后的数据
         List<WareHouseDetailed> wareHouseList = detailedMapper.getByBasicId(id);
         // 审核页面或者查看详情页面要进这个判断，这里面会将被修改掉的数据也查出来

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/controller/OfficeController.java

@@ -119,12 +119,33 @@ public class OfficeController {
                                                       @RequestParam(required = false) String extId,
                                                       @RequestParam(required = false) String type,
                                                       @RequestParam(required = false, defaultValue = CommonConstants.NO) String showAll) {
-        //根据签字注师2岗位用户所在部门查部门数据
         List <OfficeDTO> list = officeService.findList ( tenantId, parentId );
         //List <OfficeDTO> rootTree = officeService.getRootTree (list, extId, type, showAll,"1" );
         List <OfficeDTO> rootTree = officeService.getOldRootTree (parentId,list, extId, type, showAll );
         return ResponseEntity.ok ( rootTree );
     }
+    /**
+     * 根据签字注师岗位获取部门数据。
+     *
+     * @param extId   排除的ID
+     * @param type    类型（1：公司；2：部门）
+     * @param showAll 是否显示不可用数据 1 显示 0 隐藏
+     * @return
+     */
+    @ApiLog("根据签字注师岗位获取部门数据")
+    @GetMapping("accessTreeData")
+    public ResponseEntity <List <OfficeDTO>> accessTreeData(@RequestParam(required = false) String tenantId,
+                                                      @RequestParam(required = false) String parentId,
+                                                      @RequestParam(required = false) String extId,
+                                                      @RequestParam(required = false) String type,
+                                                      @RequestParam(required = false, defaultValue = CommonConstants.NO) String showAll) {
+        //根据签字注师2岗位用户所在部门查部门数据
+        List <OfficeDTO> list = officeService.findAccessList ( tenantId, parentId );
+        //List <OfficeDTO> rootTree = officeService.getRootTree (list, extId, type, showAll,"1" );
+        List <OfficeDTO> rootTree = officeService.getOldRootTree (parentId,list, extId, type, showAll );
+
+        return ResponseEntity.ok ( rootTree );
+    }
 
     /**
      * 获取机构JSON数据。

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/mapper/OfficeMapper.java

@@ -47,6 +47,14 @@ public interface OfficeMapper extends TreeMapper <Office> {
      */
     public List <OfficeDTO> findList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper);
 
+    /**
+     * 根据签字注师2获取列表
+     *
+     * @return
+     */
+    @InterceptorIgnore(tenantLine = "true")
+    public List <OfficeDTO> findAccessList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper);
+
     SysParameterValue findValueByParameter(@Param("parameter")String parameter, @Param("branchOffice")String branchOffice);
 
     /**

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/mapper/xml/OfficeMapper.xml

@@ -225,5 +225,37 @@
             and parent_id = #{rootId}
             and NAME LIKE concat('%','评估','%')
     </select>
+    <select id="findAccessList" resultType="com.jeeplus.sys.service.dto.OfficeDTO">
+        SELECT DISTINCT
+        a.id,
+               a.parent_id    AS "parent.id",
+               a.parent_ids,
+               a.area,
+               a.code,
+               a.name,
+               a.sort,
+               a.type,
+               a.grade,
+               a.address,
+               a.zip_code,
+               a.master,
+               a.phone,
+               a.fax,
+               a.email,
+               a.remarks,
+               a.create_by_id AS "createBy.id",
+               a.create_time,
+               a.update_by_id AS "updateBy.id",
+               a.update_time,
+               a.del_flag,
+               a.useable      AS useable,
+               a.tenant_id    AS "tenantDTO.id",
+               p.name         AS "parent.name"
+        FROM sys_office a
+                 LEFT JOIN sys_office p ON p.id = a.parent_id
+                 LEFT JOIN sys_user_post AS user_post ON user_post.user_id = a.id
+	             LEFT JOIN sys_post AS post on user_post.post_id = post.id
+            ${ew.customSqlSegment}
+    </select>
 
 </mapper>

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/service/OfficeService.java

@@ -15,6 +15,7 @@ import com.jeeplus.core.service.TreeService;
 import com.jeeplus.sys.domain.Office;
 import com.jeeplus.sys.mapper.OfficeMapper;
 import com.jeeplus.sys.service.dto.OfficeDTO;
+import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.service.mapstruct.OfficeWrapper;
 import com.jeeplus.sys.utils.UserUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -42,6 +43,9 @@ public class OfficeService extends TreeService <OfficeMapper, Office> {
     @Autowired
     private OfficeWrapper officeWrapper;
 
+    @Autowired
+    private UserService userService;
+
     /**
      * 获取二级节点数据信息
      * @return
@@ -57,7 +61,6 @@ public class OfficeService extends TreeService <OfficeMapper, Office> {
      */
     public List <OfficeDTO> findList(String tenantId, String parentId) {
         QueryWrapper queryWrapper = new QueryWrapper ( );
-        //查询签字注师2岗位用户信息
 
         queryWrapper.like ( StringUtils.isNotBlank ( parentId ), "a.parent_ids", "," + parentId + "," );
         queryWrapper.eq ( StringUtils.isNotBlank ( tenantId ), "a.tenant_id", tenantId );
@@ -66,6 +69,23 @@ public class OfficeService extends TreeService <OfficeMapper, Office> {
         return baseMapper.findList ( queryWrapper );
     }
 
+    /**
+     * 根据签字注师2获取列表
+     *
+     * @return
+     */
+    public List <OfficeDTO> findAccessList(String tenantId, String parentId) {
+        QueryWrapper queryWrapper = new QueryWrapper ( );
+        //查询签字注师2岗位用户信息
+        List<String> offId = userService.findOffId();
+        queryWrapper.like ( StringUtils.isNotBlank ( parentId ), "a.parent_ids", "," + parentId + "," );
+        queryWrapper.eq ( StringUtils.isNotBlank ( tenantId ), "a.tenant_id", tenantId );
+        queryWrapper.eq ( "a.del_flag", 0 );
+        queryWrapper.in ( "a.id", offId );
+        queryWrapper.orderByAsc ( "a.sort" );
+        return baseMapper.findAccessList ( queryWrapper );
+    }
+
     public List <OfficeDTO> getAccessRootTree(List<OfficeDTO> list, String extId, String type, String showAll, String showMyOffice) {
         List<OfficeDTO> offices = Lists.newArrayList ();
         // 获取到所有parent_id为‘0’的部门数据

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/service/UserService.java

@@ -442,4 +442,23 @@ public class UserService extends ServiceImpl <UserMapper, User> {
         page.setRecords(list1);
         return  page;
     }
+
+    /**
+     * 岗位分页检索
+     * @param
+     * @param
+     * @return
+     */
+    public List<String> findOffId() {
+        UserDTO dto = new UserDTO();
+        List <UserDTO> list1 = baseMapper.findList1(dto);
+        List<String> list = new ArrayList<>();
+        list1.forEach(li->{
+            list.add(li.getOfficeDTO().getId());
+        });
+        list1.forEach(li->{
+            list.add(li.getCompanyDTO().getId());
+        });
+        return  list;
+    }
 }