Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseOutDetailsController.java

@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.bonus.common.log.annotation.SysLog;
-import com.bonus.common.security.annotation.RequiresPermissions;
 import com.bonus.material.lease.domain.LeaseOutDetails;
 import com.bonus.material.lease.service.ILeaseOutDetailsService;
 import com.bonus.common.core.web.controller.BaseController;
@@ -34,6 +33,7 @@ import com.bonus.common.core.web.page.TableDataInfo;
 @RestController
 @RequestMapping("/lease_out_details")
 public class LeaseOutDetailsController extends BaseController {
+
     @Autowired
     private ILeaseOutDetailsService leaseOutDetailsService;
 
@@ -41,7 +41,6 @@ public class LeaseOutDetailsController extends BaseController {
      * 查询领料出库详细列表
      */
     @ApiOperation(value = "查询领料出库详细列表")
-    @RequiresPermissions("lease:details:list")
     @GetMapping("/list")
     public TableDataInfo list(LeaseOutDetails leaseOutDetails) {
         startPage();
@@ -54,12 +53,11 @@ public class LeaseOutDetailsController extends BaseController {
      */
     @ApiOperation(value = "导出领料出库详细列表")
     @PreventRepeatSubmit
-    @RequiresPermissions("lease:details:export")
     @SysLog(title = "领料出库详细", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出领料出库详细")
     @PostMapping("/export")
     public void export(HttpServletResponse response, LeaseOutDetails leaseOutDetails) {
         List<LeaseOutDetails> list = leaseOutDetailsService.selectLeaseOutDetailsList(leaseOutDetails);
-        ExcelUtil<LeaseOutDetails> util = new ExcelUtil<LeaseOutDetails>(LeaseOutDetails.class);
+        ExcelUtil<LeaseOutDetails> util = new ExcelUtil<>(LeaseOutDetails.class);
         util.exportExcel(response, list, "领料出库详细数据");
     }
 
@@ -67,7 +65,6 @@ public class LeaseOutDetailsController extends BaseController {
      * 获取领料出库详细详细信息
      */
     @ApiOperation(value = "获取领料出库详细详细信息")
-    @RequiresPermissions("lease:details:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(leaseOutDetailsService.selectLeaseOutDetailsById(id));
@@ -78,7 +75,6 @@ public class LeaseOutDetailsController extends BaseController {
      */
     @ApiOperation(value = "新增领料出库详细")
     @PreventRepeatSubmit
-    @RequiresPermissions("lease:details:add")
     @SysLog(title = "领料出库详细", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增领料出库详细")
     @PostMapping
     public AjaxResult add(@RequestBody List<LeaseOutDetails> leaseOutDetailsList) {
@@ -94,7 +90,6 @@ public class LeaseOutDetailsController extends BaseController {
      */
     @ApiOperation(value = "修改领料出库详细")
     @PreventRepeatSubmit
-    @RequiresPermissions("lease:details:edit")
     @SysLog(title = "领料出库详细", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改领料出库详细")
     @PutMapping
     public AjaxResult edit(@RequestBody LeaseOutDetails leaseOutDetails) {
@@ -110,7 +105,6 @@ public class LeaseOutDetailsController extends BaseController {
      */
     @ApiOperation(value = "删除领料出库详细")
     @PreventRepeatSubmit
-    @RequiresPermissions("lease:details:remove")
     @SysLog(title = "领料出库详细", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->删除领料出库详细")
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {

bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java

@@ -139,9 +139,15 @@ public class LeaseApplyInfo extends BaseEntity {
     @ApiModelProperty(value = "租赁工程")
     private String leaseProject;
 
+    @ApiModelProperty(value = "租赁工程id")
+    private String leaseProjectId;
+
     @ApiModelProperty(value = "租赁单位")
     private String leaseUnit;
 
+    @ApiModelProperty(value = "租赁单位id")
+    private String leaseUnitId;
+
     @ApiModelProperty(value = "协议号")
     private String agreementCode;
 

bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java

@@ -16,7 +16,7 @@ public interface LeaseApplyDetailsMapper {
      * @param id 领料任务详细主键
      * @return 领料任务详细
      */
-    public LeaseApplyDetails selectLeaseApplyDetailsById(Long id);
+    LeaseApplyDetails selectLeaseApplyDetailsById(Long id);
 
     /**
      * 查询领料任务详细列表
@@ -24,7 +24,7 @@ public interface LeaseApplyDetailsMapper {
      * @param leaseApplyDetails 领料任务详细
      * @return 领料任务详细集合
      */
-    public List<LeaseApplyDetails> selectLeaseApplyDetailsList(LeaseApplyDetails leaseApplyDetails);
+    List<LeaseApplyDetails> selectLeaseApplyDetailsList(LeaseApplyDetails leaseApplyDetails);
 
     /**
      * 新增领料任务详细
@@ -32,9 +32,9 @@ public interface LeaseApplyDetailsMapper {
      * @param leaseApplyDetails 领料任务详细
      * @return 结果
      */
-    public int insertLeaseApplyDetails(LeaseApplyDetails leaseApplyDetails);
+    int insertLeaseApplyDetails(LeaseApplyDetails leaseApplyDetails);
 
-    public int insertLeaseApplyDetailsList(List<LeaseApplyDetails> leaseApplyDetails);
+    int insertLeaseApplyDetailsList(List<LeaseApplyDetails> leaseApplyDetails);
 
     /**
      * 修改领料任务详细
@@ -42,7 +42,7 @@ public interface LeaseApplyDetailsMapper {
      * @param leaseApplyDetails 领料任务详细
      * @return 结果
      */
-    public int updateLeaseApplyDetails(LeaseApplyDetails leaseApplyDetails);
+    int updateLeaseApplyDetails(LeaseApplyDetails leaseApplyDetails);
 
     /**
      * 删除领料任务详细
@@ -50,7 +50,7 @@ public interface LeaseApplyDetailsMapper {
      * @param id 领料任务详细主键
      * @return 结果
      */
-    public int deleteLeaseApplyDetailsById(Long id);
+    int deleteLeaseApplyDetailsById(Long id);
 
     /**
      * 批量删除领料任务详细
@@ -58,9 +58,9 @@ public interface LeaseApplyDetailsMapper {
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteLeaseApplyDetailsByIds(Long[] ids);
+    int deleteLeaseApplyDetailsByIds(Long[] ids);
 
-    public int deleteLeaseApplyDetailsByParentIds(Long[] ids);
+    int deleteLeaseApplyDetailsByParentIds(Long[] ids);
 
     List<LeaseApplyDetails> getByParentId(Long parentId);
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseApplyInfoService.java

@@ -28,7 +28,7 @@ public interface ILeaseApplyInfoService {
      * @param leaseApplyInfo 领料任务
      * @return 领料任务集合
      */
-    public List<LeaseApplyInfo> selectLeaseApplyInfoList(LeaseApplyInfo leaseApplyInfo);
+    List<LeaseApplyInfo> selectLeaseApplyInfoList(LeaseApplyInfo leaseApplyInfo);
 
     /**
      * 新增领料任务
@@ -36,7 +36,7 @@ public interface ILeaseApplyInfoService {
      * @param leaseApplyRequestVo 领料任务
      * @return 结果
      */
-    public AjaxResult insertLeaseApplyInfo(TmTaskRequestVo leaseApplyRequestVo);
+    AjaxResult insertLeaseApplyInfo(TmTaskRequestVo leaseApplyRequestVo);
 
     /**
      * 修改领料任务
@@ -44,7 +44,7 @@ public interface ILeaseApplyInfoService {
      * @param tmTaskRequestVo 领料任务
      * @return 结果
      */
-    public boolean updateLeaseApplyInfo(TmTaskRequestVo tmTaskRequestVo);
+    boolean updateLeaseApplyInfo(TmTaskRequestVo tmTaskRequestVo);
 
     /**
      * 批量删除领料任务
@@ -52,7 +52,7 @@ public interface ILeaseApplyInfoService {
      * @param ids 需要删除的领料任务主键集合
      * @return 结果
      */
-    public int deleteLeaseApplyInfoByIds(Long[] ids);
+    int deleteLeaseApplyInfoByIds(Long[] ids);
 
     /**
      * 删除领料任务信息
@@ -60,5 +60,5 @@ public interface ILeaseApplyInfoService {
      * @param id 领料任务主键
      * @return 结果
      */
-    public int deleteLeaseApplyInfoById(Long id);
+    int deleteLeaseApplyInfoById(Long id);
 }

bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml

@@ -31,7 +31,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="estimateLeaseTime"    column="estimate_lease_time"    />
         <result property="costBearingParty"    column="cost_bearing_party"    />
         <result property="leaseProject" column="pro_name" />
+        <result property="leaseProjectId" column="project_id" />
         <result property="leaseUnit" column="unit_name" />
+        <result property="leaseUnitId" column="unit_id" />
         <result property="agreementCode" column="agreement_code" />
     </resultMap>
 
@@ -42,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             lai.dept_audit_remark, lai.direct_audit_by, lai.direct_audit_time, lai.direct_audit_remark,
             lai.create_by, lai.create_time, lai.update_by, lai.update_time, lai.remark, lai.company_id,
             lai.status, lai.direct_id, lai.lease_type, lai.estimate_lease_time, lai.cost_bearing_party,
-            bu.unit_name, bp.pro_name, bai.agreement_code
+            bai.unit_id,bai.project_id,bu.unit_name, bp.pro_name, bai.agreement_code
         from
             lease_apply_info lai
         left join