修改

bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java

@@ -352,4 +352,9 @@ public class LeaseApplyInfo extends BaseEntity{
     @ApiModelProperty(value = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private String leaseTime;
+
+    private String informationId;
+
+    @ApiModelProperty(value = "发布数量")
+    private BigDecimal publishNum;
 }

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

@@ -385,6 +385,18 @@ public class LeaseTaskController extends BaseController {
         return success(listByMaType);
     }
 
+    /**
+     * 领用申请撤回功能
+     * 将任务状态撤回到--待提交
+     * @param leaseApplyInfo
+     * @return
+     */
+    @ApiOperation(value = "领用申请撤回")
+    @GetMapping("/revoke")
+    public AjaxResult revoke(LeaseApplyInfo leaseApplyInfo) {
+        return service.revoke(leaseApplyInfo);
+    }
+
 
     /**
      * 业务联系单pdf

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

@@ -300,4 +300,46 @@ public interface LeaseTaskMapper {
     int insertBackRecordByMaId(LeaseApplyDetails bean);
 
     WorkApplyInfo getInformationById(WorkApplyInfo workApplyInfo);
+
+    /**
+     * 根据taskId查询领用申请详情
+     * @param leaseApplyInfo
+     * @return
+     */
+    LeaseApplyInfo getRecordIdByTaskId(LeaseApplyInfo leaseApplyInfo);
+
+    /**
+     * 根据recordId查询领用申请详情
+     * @param recordId
+     * @return
+     */
+    List<LeaseApplyInfo> getInformationIdByRecordId(Integer recordId);
+
+    /**
+     * 删除领用申请详情
+     * @param informationId
+     * @return
+     */
+    int deleteInformationPeople(String informationId);
+
+    /**
+     * 删除领用申请详情
+     * @param informationId
+     * @return
+     */
+    int deleteInformation(String informationId);
+
+    /**
+     * 删除领用申请详情
+     * @param recordId
+     * @return
+     */
+    int deleteRecordHistory(Integer recordId);
+
+    /**
+     * 删除领用申请详情
+     * @param recordId
+     * @return
+     */
+    int deleteRecord(Integer recordId);
 }

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

@@ -164,5 +164,12 @@ public interface ILeaseTaskService {
      * @return
      */
     AjaxResult delLeaseDetails(LeaseApplyDetails leaseApplyDetails);
+
+    /**
+     * 领用申请撤回
+     * @param leaseApplyInfo
+     * @return
+     */
+    AjaxResult revoke(LeaseApplyInfo leaseApplyInfo);
 }
 

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

@@ -402,12 +402,15 @@
         GROUP_CONCAT(DISTINCT mt1.type_name) AS maTypeNames,
         bp.contract_part as contractPart,
         sd.dept_name as impUnitName,
+        IFNULL(ab.num,0) as publishNum,
         bai.agreement_code
         from
         lease_apply_info lai
         left join sys_workflow_record swr on swr.task_id = lai.task_id
         left join tm_task tt on lai.task_id = tt.task_id
         left join lease_apply_details lad on lai.id = lad.parent_id
+        LEFT JOIN ( SELECT parent_id, sum( num ) AS num FROM lease_publish_details GROUP BY parent_id ) ab
+        ON ab.parent_id = lad.parent_id
         LEFT JOIN (SELECT parent_id, unit_id, project_id from lease_publish_details
         GROUP BY parent_id ) a on a.parent_id = lai.id
         LEFT JOIN bm_agreement_info bai on a.unit_id = bai.unit_id
@@ -1129,6 +1132,26 @@
             AND ma_id = #{maId}
         </if>
     </delete>
+    <delete id="deleteInformationPeople">
+        DELETE FROM uni_org.sys_information_people
+        WHERE
+            information_id = #{informationId}
+    </delete>
+    <delete id="deleteInformation">
+        DELETE FROM uni_org.sys_information
+        WHERE
+            id = #{informationId}
+    </delete>
+    <delete id="deleteRecordHistory">
+        DELETE FROM sys_workflow_record_history
+        WHERE
+            record_id = #{recordId}
+    </delete>
+    <delete id="deleteRecord">
+        DELETE FROM sys_workflow_record
+        WHERE
+            id = #{recordId}
+    </delete>
 
     <select id="getAgreementInfo" resultType="com.bonus.material.task.domain.TmTaskAgreement">
         select
@@ -1278,4 +1301,20 @@
         </where>
 
     </select>
+    <select id="getRecordIdByTaskId" resultType="com.bonus.common.biz.domain.lease.LeaseApplyInfo">
+        SELECT
+            swr.id as recordId
+        FROM
+            sys_workflow_record swr
+        WHERE
+            swr.task_id=#{taskId}
+    </select>
+    <select id="getInformationIdByRecordId" resultType="com.bonus.common.biz.domain.lease.LeaseApplyInfo">
+            SELECT
+                si.id as informationId
+            FROM
+                uni_org.sys_information si
+            WHERE
+                si.business_id= #{recordId}
+    </select>
 </mapper>