bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

协议修改模块位置

This commit is contained in:
dingjie 2023-12-16 20:52:13 +08:00
parent 8fe72fc067
commit ee9d9e3a96
6 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/AgreementInfoController.java → sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/AgreementInfoController.java
View File

@ -1,7 +1,7 @@
package com.bonus.sgzb.base.controller; package com.bonus.sgzb.material.controller;
import com.bonus.sgzb.base.domain.AgreementInfo; import com.bonus.sgzb.material.domain.AgreementInfo;
import com.bonus.sgzb.base.service.AgreementInfoService; import com.bonus.sgzb.material.service.AgreementInfoService;
import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo; import com.bonus.sgzb.common.core.web.page.TableDataInfo;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/AgreementInfo.java → sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java
View File

@ -1,4 +1,4 @@
package com.bonus.sgzb.base.domain; package com.bonus.sgzb.material.domain;
import com.bonus.sgzb.common.core.annotation.Excel; import com.bonus.sgzb.common.core.annotation.Excel;
import com.bonus.sgzb.common.core.web.domain.BaseEntity; import com.bonus.sgzb.common.core.web.domain.BaseEntity;

5
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/AgreementInfoMapper.java → sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/AgreementInfoMapper.java
View File

@ -1,7 +1,6 @@
package com.bonus.sgzb.base.mapper; package com.bonus.sgzb.material.mapper;
import com.bonus.sgzb.base.domain.AgreementInfo; import com.bonus.sgzb.material.domain.AgreementInfo;
import com.bonus.sgzb.base.domain.MaintenanceGang;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.Date; import java.util.Date;

6
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/AgreementInfoService.java → sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/AgreementInfoService.java
View File

@ -1,8 +1,6 @@
package com.bonus.sgzb.base.service; package com.bonus.sgzb.material.service;
import com.bonus.sgzb.base.domain.AgreementInfo; import com.bonus.sgzb.material.domain.AgreementInfo;
import com.bonus.sgzb.base.domain.MaintenanceGang;
import com.bonus.sgzb.base.domain.WarehouseKeeper;
import java.util.List; import java.util.List;

13
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/AgreementInfoServiceImpl.java → sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/AgreementInfoServiceImpl.java
View File

@ -1,18 +1,13 @@
package com.bonus.sgzb.base.service.impl; package com.bonus.sgzb.material.service.impl;
import com.bonus.sgzb.base.domain.AgreementInfo; import com.bonus.sgzb.material.domain.AgreementInfo;
import com.bonus.sgzb.base.domain.MaintenanceGang; import com.bonus.sgzb.material.mapper.AgreementInfoMapper;
import com.bonus.sgzb.base.mapper.AgreementInfoMapper; import com.bonus.sgzb.material.service.AgreementInfoService;
import com.bonus.sgzb.base.mapper.MaintenanceGangMapper;
import com.bonus.sgzb.base.service.AgreementInfoService;
import com.bonus.sgzb.base.service.MaintenanceGangService;
import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.utils.DateUtils;
import com.bonus.sgzb.common.core.utils.StringHelper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;

10
sgzb-modules/sgzb-base/src/main/resources/mapper/base/AgreementInfoMapper.xml → sgzb-modules/sgzb-material/src/main/resources/mapper/material/AgreementInfoMapper.xml
View File

@ -2,9 +2,9 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.sgzb.base.mapper.AgreementInfoMapper"> <mapper namespace="com.bonus.sgzb.material.mapper.AgreementInfoMapper">
<resultMap type="com.bonus.sgzb.base.domain.AgreementInfo" id="BmAgreementInfoResult"> <resultMap type="com.bonus.sgzb.material.domain.AgreementInfo" id="BmAgreementInfoResult">
<result property="agreementId" column="agreement_id"/> <result property="agreementId" column="agreement_id"/>
<result property="agreementCode" column="agreement_code"/> <result property="agreementCode" column="agreement_code"/>
<result property="signTime" column="sign_time"/> <result property="signTime" column="sign_time"/>
@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
UPDATE bm_agreement_info SET status = '0' WHERE agreement_id = #{id} UPDATE bm_agreement_info SET status = '0' WHERE agreement_id = #{id}
</update> </update>
<select id="getAgreementInfoAll" resultType="com.bonus.sgzb.base.domain.AgreementInfo"> <select id="getAgreementInfoAll" resultType="com.bonus.sgzb.material.domain.AgreementInfo">
SELECT bai.agreement_id, bai.agreement_code , contract_code,file_url ,file_name,sign_time, SELECT bai.agreement_id, bai.agreement_code , contract_code,file_url ,file_name,sign_time,
bui.unit_id,bui.unit_name , bp.lot_id as projectId , bp.lot_name as projectName, bui.unit_id,bui.unit_name , bp.lot_id as projectId , bp.lot_name as projectName,
plan_start_time,lease_day,auth_person,phone,bai.remark plan_start_time,lease_day,auth_person,phone,bai.remark
@ -121,12 +121,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where> </where>
</select> </select>
<select id="getUnitList" resultType="com.bonus.sgzb.base.domain.AgreementInfo"> <select id="getUnitList" resultType="com.bonus.sgzb.material.domain.AgreementInfo">
SELECT unit_id , unit_name FROM bm_unit_info SELECT unit_id , unit_name FROM bm_unit_info
WHERE del_flag = '0' WHERE del_flag = '0'
</select> </select>
<select id="getProjectList" resultType="com.bonus.sgzb.base.domain.AgreementInfo"> <select id="getProjectList" resultType="com.bonus.sgzb.material.domain.AgreementInfo">
SELECT lot_id as projectId,lot_name as projectName FROM `bm_project_lot` SELECT lot_id as projectId,lot_name as projectName FROM `bm_project_lot`
WHERE del_flag = '0' WHERE del_flag = '0'
</select> </select>