Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/controller/WareHouseController.java

@@ -65,6 +65,18 @@ public class WareHouseController {
     }
 
     /**
+     * 入库汇总列表查询
+     * @param dto
+     * @return
+     */
+    @ApiOperation(value = "入库汇总列表查询")
+    @GetMapping("/wareHouseSummaryList")
+    public ResponseEntity<IPage<WareHouseDto>> wareHouseSummaryList(Page<WareHouseDto> page, WareHouseDto dto) throws Exception{
+        IPage<WareHouseDto> iPage = basicService.summaryList(page, dto);
+        return ResponseEntity.ok(iPage);
+    }
+
+    /**
      * 新增/修改
      * @param dto
      * @return

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/mapper/WareHouseBasicMapper.java

@@ -18,4 +18,6 @@ public interface WareHouseBasicMapper extends BaseMapper<WareHouseBasic> {
     IPage<WareHouseDto> findList(Page<WareHouseDto> page,@Param(Constants.WRAPPER) QueryWrapper<WareHouseDto> queryWrapper);
 
     String getUserNameByUserId(String id);
+
+    IPage<WareHouseDto> summaryList(Page<WareHouseDto> page,@Param(Constants.WRAPPER) QueryWrapper<WareHouseDto> queryWrapper);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/mapper/xml/WareHouseBasicMapper.xml

@@ -23,4 +23,27 @@
 	<select id="getUserNameByUserId" resultType="java.lang.String">
 		select name from sys_user where id = #{id}
 	</select>
+    <select id="summaryList"
+            resultType="com.jeeplus.test.materialManagement.wareHouse.service.dto.WareHouseDto">
+		SELECT
+			a.id,
+			a.create_by,
+			a.create_date,
+			c.ware_house_number,
+			b.ware_house_type,
+			b.trade_name,
+			a.trade_number,
+			b.company,
+			c.ware_house_date,
+			so.name as wareHouseManOfficeName,
+			sy.name as wareHouseManName
+		FROM
+			material_management_warehouse_summary a
+			left join material_management_warehouse_detailed b on a.detailed_id = b.id and b.del_flag = 0
+			left join sys_user sy on sy.id = b.ware_house_man
+			left join sys_office so on sy.office_id = so.id
+			left join material_management_warehouse_basics c on b.basic_id = c.id and c.del_flag = 0
+			${ew.customSqlSegment}
+		ORDER BY a.update_date DESC
+	</select>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/service/WareHouseBasicService.java

@@ -398,4 +398,35 @@ public class WareHouseBasicService {
 
         return basicMapper.findList(page, queryWrapper);
     }
+
+    /**
+     * 列表查询
+     */
+    public IPage<WareHouseDto> summaryList(Page<WareHouseDto> page , WareHouseDto dto) throws Exception{
+        QueryWrapper<WareHouseDto> queryWrapper = QueryWrapperGenerator.buildQueryCondition(dto, WareHouseDto.class);
+
+        queryWrapper.eq("a.del_flag", "0");
+        queryWrapper.gt("a.trade_number", "0");
+
+        if (StringUtils.isNotEmpty(dto.getWareHouseNumber())) {
+            queryWrapper.like("c.ware_house_number", dto.getWareHouseNumber());
+        }
+        if (StringUtils.isNotEmpty(dto.getTradeName())) {
+            queryWrapper.like("b.trade_name", dto.getTradeName());
+        }
+        if (StringUtils.isNotEmpty(dto.getWareHouseMan())) {
+            queryWrapper.like("b.ware_house_man", dto.getWareHouseMan());
+        }
+        if (StringUtils.isNotEmpty(dto.getWareHouseManOffice())) {
+            queryWrapper.like("so.id", dto.getWareHouseManOffice());
+        }
+        // 入库时间
+        String[] contractDates = dto.getWareHouseDates();
+        if (contractDates != null) {
+
+            queryWrapper.between("c.ware_house_date", contractDates[0], contractDates[1]);
+        }
+
+        return basicMapper.summaryList(page, queryWrapper);
+    }
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/service/dto/WareHouseDto.java

@@ -135,6 +135,27 @@ public class WareHouseDto {
     private List<WorkAttachmentDto> files;
 
     /**
+     * 入库人
+     */
+    private String wareHouseMan;
+
+    /**
+     * 入库人名称
+     */
+    private String wareHouseManName;
+
+    /**
+     * 入库人部门
+     */
+    private String wareHouseManOffice;
+
+    /**
+     * 入库人部门名称
+     */
+    private String wareHouseManOfficeName;
+
+
+    /**
      * 备注
      */
     private String remarks;

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursement/reimbursementInfo/mapper/xml/ReimbursementInfoMapper.xml

@@ -46,9 +46,6 @@
 
 	<update id="updateStatusById">
 		UPDATE reimbursement_info SET type = #{type}
-		<if test="type == '3'.toString">
-			, proc_ins_id = NULL, process_definition_id = NULL
-		</if>
 	    WHERE id = #{id}
 	</update>
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/mapper/xml/WorkContractFileMapper.xml

@@ -4,11 +4,7 @@
 
 	<update id="updateStatusById">
 		UPDATE work_contract_file SET filed_type = #{filedType}, filed_data = NOW()
-		 <if test="filedType == '4'.toString()">
-		 	,proc_ins_id = null
-		 	,process_definition_id = null
-		 </if>
-		 WHERE del_flag = 0 AND contract_info_id = #{id}
+		WHERE del_flag = 0 AND contract_info_id = #{id}
 	</update>
 
 	<select id="selectFileByContractInfoId" resultType="com.jeeplus.test.workContract.domain.WorkContractFile">

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/mapper/xml/WorkContractInfoMapper.xml

@@ -81,6 +81,7 @@
 			a.create_date,
 			a.create_by,
 			a.update_date,
+			a.status,
 			a.update_by,
 			a.del_flag,
 			d.id as contract_file_id,