直转申请,直转记录查询

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectApplyUrl.java

@@ -1,6 +1,8 @@
 package com.bonus.material.ma.domain;
 
 import com.bonus.common.core.web.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -9,7 +11,9 @@ import lombok.EqualsAndHashCode;
 public class DirectApplyUrl extends BaseEntity {
     private String url;
 
-    public DirectApplyUrl(String s) {
+    @JsonCreator
-        this.url = s;
+    public DirectApplyUrl(@JsonProperty("url") String url) {
+        this.url = url;
     }
+
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/DirectRotationImpl.java

@@ -48,6 +48,9 @@ public class DirectRotationImpl implements DirectRotationService {
         if (directApplyInfoDetails != null) {
             if (directApplyInfoDetails.getDirectApplyInfo() != null) {
                 DirectApplyInfo directApplyInfos = directApplyInfoDetails.getDirectApplyInfo();
+                if (directApplyInfos.getBackAgreementId()==directApplyInfos.getLeaseAgreementId()){
+                    return AjaxResult.error("申请失败，不能转入同单位同工程");
+                }
                 directApplyInfos.setCode(workSiteDirectManageService.genderLeaseCode());
                 directApplyInfos.setCreateTime(new Date());
                 List<String> urls = new ArrayList<>();
@@ -95,6 +98,9 @@ public class DirectRotationImpl implements DirectRotationService {
         if (directApplyInfoDetails != null) {
             if (directApplyInfoDetails.getDirectApplyInfo() != null && directApplyInfoDetails.getDirectApplyInfo().getId() != null) {
                 DirectApplyInfo directApplyInfos = directApplyInfoDetails.getDirectApplyInfo();
+                if (directApplyInfos.getBackAgreementId()==directApplyInfos.getLeaseAgreementId()){
+                    return AjaxResult.error("申请失败，不能转入同单位同工程");
+                }
                 directApplyInfos.setUpdateTime(new Date());
                 List<String> urls = new ArrayList<>();
                 if (directApplyInfoDetails.getDirectApplyInfo().getDirUrls() != null) {

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WorkSiteDirectManageImpl.java

@@ -333,7 +333,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
             if (StringUtils.isNotBlank(directApplyInfoDetails.getId())) {
                 DirectApplyInfo directApplyInfos = getDirectApplyInfoById(directApplyInfoDetails.getId());
                 directApplyInfos.setStatus("1");
-                directApplyInfos.setAuditor(SecurityUtils.getLoginUser().getUsername());
+                directApplyInfos.setAuditor(SecurityUtils.getUsername());
                 directApplyInfos.setAuditTime(DateUtils.getNowDate());
                 res = refuseDirectApplyInfo(directApplyInfos);
             } else {

bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementReduceController.java

@@ -60,6 +60,41 @@ public class SltAgreementReduceController extends BaseController {
         return success(list);
     }
 
+
+    @ApiOperation(value = "查询协议申请机具名称")
+    // @RequiresPermissions("settlement:apply:list")
+    @GetMapping("/selectByMaType")
+    public AjaxResult selectByMatype(SltAgreementReduce sltAgreement) {
+        List<SltAgreementReduce> list = null;
+        if(sltAgreement!=null){
+            if (sltAgreement.getAgreementId()!=null){
+                list = sltAgreementReduceService.selectByMatype(sltAgreement);
+            }
+
+        }else{
+
+        }
+
+        return success(list);
+    }
+
+    @ApiOperation(value = "查询协议申请机具规格")
+    // @RequiresPermissions("settlement:apply:list")
+    @GetMapping("/selectByMaModel")
+    public AjaxResult selectByMaModel(SltAgreementReduce sltAgreement) {
+        List<SltAgreementReduce> list = null;
+        if(sltAgreement!=null){
+            if (sltAgreement.getAgreementId()!=null){
+                list = sltAgreementReduceService.selectByMaModel(sltAgreement);
+            }
+
+        }else{
+
+        }
+
+        return success(list);
+    }
+
     /**
      * 查询协议申请减免明细
      */

bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/mapper/SltAgreementReduceMapper.java

@@ -26,4 +26,9 @@ public interface SltAgreementReduceMapper {
     void insertBatchReduceDetail(@Param("detailList") List<SltAgreementReduce> detailList);
 
     List<SltAgreementReduce> findOverlappingReductions(SltAgreementReduce detail);
+
+
+    List<SltAgreementReduce> selectByMatype(SltAgreementReduce sltAgreement);
+
+    List<SltAgreementReduce> selectByMaModel(SltAgreementReduce sltAgreement);
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/ISltAgreementReduceService.java

@@ -18,4 +18,8 @@ public interface ISltAgreementReduceService {
     List<SltAgreementReduce> getApplyReduceList(SltAgreementReduce sltAgreement);
 
     AjaxResult addApply(SltAgreementReduce sltAgreement);
+
+    List<SltAgreementReduce> selectByMatype(SltAgreementReduce sltAgreement);
+
+    List<SltAgreementReduce> selectByMaModel(SltAgreementReduce sltAgreement);
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementReduceServiceImpl.java

@@ -75,6 +75,16 @@ public class SltAgreementReduceServiceImpl implements ISltAgreementReduceService
         }
     }
 
+    @Override
+    public List<SltAgreementReduce> selectByMatype(SltAgreementReduce sltAgreement) {
+        return sltAgreementRecudceMapper.selectByMatype(sltAgreement);
+    }
+
+    @Override
+    public List<SltAgreementReduce> selectByMaModel(SltAgreementReduce sltAgreement) {
+        return sltAgreementRecudceMapper.selectByMaModel(sltAgreement);
+    }
+
     private void initSltAgreement(SltAgreementReduce sltAgreement) {
         sltAgreement.setCode(generateCode());
         sltAgreement.setCreateTime(new Date());

bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WorkSiteDirectManageMapper.xml

@@ -411,6 +411,11 @@
     <select id="getList" resultType="com.bonus.material.ma.domain.DirectApplyInfo">
         SELECT DISTINCT
             dai.*,
+            dai.create_time as createTime,
+            dai.back_man as backMan,
+            dai.back_phone as backPhone,
+            dai.lease_man as leaseMan,
+            dai.lease_phone as leasePhone,
             bpl.pro_id AS backProId,
             bpl.pro_name AS backProName,
             bui.unit_id AS backUnitId,

bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementReduceMapper.xml

@@ -84,6 +84,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND start_time <= #{endTime}
             AND (end_time >= #{startTime} OR end_time IS NULL)
         </if>
+
+        <if test="typeId != null">
+            and sai.type_id = #{typeId}
+
+        </if>
         ) rs
         GROUP BY rs.typeId,rs.startTime
         ORDER BY rs.maName
@@ -188,4 +193,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
               AND end_time &gt;= #{startTime}
 
     </select>
+
+    <select id="selectByMatype" resultType="com.bonus.material.settlement.domain.SltAgreementReduce">
+        SELECT
+            sai.id,
+            sai.agreement_id as agreementId,
+            mt2.type_id as typeId,
+            mt2.type_name as maName,
+            mt.type_name as maModel,
+            mt.unit_name as maUnit
+
+        FROM
+            slt_agreement_info sai
+                left join ma_type mt on sai.type_id = mt.type_id
+                LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id
+        where
+            sai.agreement_id = #{agreementId}
+          group by mt2.type_id
+    </select>
+    <select id="selectByMaModel" resultType="com.bonus.material.settlement.domain.SltAgreementReduce">
+        SELECT
+            sai.id,
+            sai.agreement_id as agreementId,
+            sai.type_id as typeId,
+            mt2.type_name as maName,
+            mt.type_name as maModel,
+            mt.unit_name as maUnit
+
+        FROM
+            slt_agreement_info sai
+                left join ma_type mt on sai.type_id = mt.type_id
+                LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id
+        where
+            sai.agreement_id = #{agreementId} and mt2.type_id = #{typeId}
+        group by mt.type_id
+    </select>
 </mapper>