Merge remote-tracking branch 'origin/main'

# Conflicts: # resources/mybatis/bm/ProjectManageMapper.xml # resources/mybatis/scrap/ScrapTaskRecordMapper.xml # src/com/bonus/bm/controller/ProjectManageController.java # src/com/bonus/bm/dao/ProjectManageDao.java # src/com/bonus/bm/service/ProjectManageService.java
机具库存收藏修改
2025-12-03 20:12:21 +08:00 · 2025-12-03 20:11:16 +08:00 · 2025-12-03 19:52:59 +08:00
5 changed files with 152 additions and 124 deletions
--- a/bin/resources/mybatis/bm/ProjectManageMapper.xml
+++ b/bin/resources/mybatis/bm/ProjectManageMapper.xml
@ -160,7 +160,8 @@
 		LEFT JOIN	bm_company bmc on bmc.ID = bmp.COMPANY_ID
 		where bmp.ID=#{id}
    </select>
-    
+
+
    <update id="update" parameterType="com.bonus.bm.beans.ProjectManageBean">
        update bm_project
        <set>
--- a/resources/mybatis/ma/GpsBindingMapper.xml
+++ b/resources/mybatis/ma/GpsBindingMapper.xml
@ -97,51 +97,57 @@
 	</select>
 	
 	<select id="findGpsFlowPage" parameterType="com.bonus.ma.beans.GpsBindingBean" resultMap="gisBean">
- 	select 	DISTINCT
-				mam.ID,matt.ID as tyoeId0,matt.`NAME` as typeName,mat.ID as tyoeId,mat.`NAME` as type,
-				mam.OUT_FAC_TIME as outFactortTime,mam.DEVICE_CODE as deviceCode,mam.OUT_FAC_NUM as outFactortNum,ROUND(mat.BUY_PRICE) as buyPrice,mam.PIC_URL as picUrl,
-			    mam.IS_FIXED_ASSETS as isFixedAssets,mat.LEASE_PRICE as leasePrice,ROUND(mat.PAY_PRICE) as payPrice,	mam.ASSETS_NUM as assetNum,mam.CYCLE_NUM as outInNum,
-				mam.REMARK as remarks,mam.PROPERTY_DEPARTMENT as propertyDepartment,mam.USE_DEPARTMENT as useDepartment,mam.SERVICE_LIFE as serviceLife,
-				mam.BATCH_STATUS as batchStatus,mam.GPS_CODE as gpsCode,mam.MAKE_ORDER_DATE as makeOrderDate,mam.INVOICE_DATE as invoiceDate,mam.QRCODE as qrcode,mam.DEVICE_TYPE as deviceType
-				,org.NAME  companyName,mam.ORIGIN_NUM  originNum,rel.ORG_ID orgId ,mam.GPS_CODE  ,flow.OPERTER_TIME  optTime,flow.OPERTER,user.`NAME`  ,user.LOGIN_NAME userName
-				,flow.GIS_CODE  gisCode,flow.type gisType
-		from ma_gis_code_flow flow
-		LEFT JOIN	mm_machines mam  on flow.MA_ID=mam.id
-		LEFT JOIN ma_status mas on mam.BATCH_STATUS = mas.BATCH_STATUS
-		left join  pm_user user on user.id=flow.OPERTER
-		LEFT JOIN mm_type mat on mam.TYPE = mat.ID
-		LEFT JOIN mm_type matt on matt.ID = mat.PARENT_ID
-		LEFT JOIN ma_org_relation rel on rel.TYPE_ID=mat.ID
-		LEFT JOIN pm_organization org on org.ID=rel.ORG_ID
-		where 1=1  and  mam.id is not null 
-	 	<if test='param.orgId !=null and param.orgId!="" and   param.orgId !="1" '>
-				and  rel.ORG_ID=#{param.orgId}
-			</if>
-			<if test="param.batchStatus != 0">
-				and mas.MA_STATUS = #{param.batchStatus}
-			</if>
-			<if test="param.deviceType != 0">
-				and mam.DEVICE_TYPE = #{param.deviceType}
-			</if>
-			<if test="param.typeName != null and param.typeName != ''">
-				and matt.`NAME` = #{param.typeName}
-			</if>
-			<if test="param.type != null and param.type != ''">
-				and mat.`NAME` = #{param.type}
-			</if>
-			<if test="param.keyWord !=null and param.keyWord !=''">
-			    and (
-				    matt.`NAME` LIKE CONCAT('%',#{param.keyWord},'%') OR
-				    mam.DEVICE_CODE LIKE CONCAT('%',#{param.keyWord},'%') OR
-				    mat.`NAME` LIKE CONCAT('%',#{param.keyWord},'%') OR
-				    mam.QRCODE LIKE CONCAT('%',#{param.keyWord},'%') OR
-				    mam.BATCH_STATUS LIKE CONCAT('%',#{param.keyWord},'%') OR
-				  	flow.GIS_CODE  LIKE CONCAT('%',#{param.keyWord},'%') OR
-				  	user.LOGIN_NAME  LIKE CONCAT('%',#{param.keyWord},'%') 
-			    )
-			</if>
+        select DISTINCT
+        mam.ID,matt.ID as tyoeId0,matt.`NAME` as typeName,mat.ID as tyoeId,mat.`NAME` as type,
+        mam.OUT_FAC_TIME as outFactortTime,mam.DEVICE_CODE as deviceCode,mam.OUT_FAC_NUM as
+        outFactortNum,ROUND(mat.BUY_PRICE) as buyPrice,mam.PIC_URL as picUrl,
+        mam.IS_FIXED_ASSETS as isFixedAssets,mat.LEASE_PRICE as leasePrice,ROUND(mat.PAY_PRICE) as payPrice,
+        mam.ASSETS_NUM as assetNum,mam.CYCLE_NUM as outInNum,
+        mam.REMARK as remarks,mam.PROPERTY_DEPARTMENT as propertyDepartment,mam.USE_DEPARTMENT as
+        useDepartment,mam.SERVICE_LIFE as serviceLife,
+        mam.BATCH_STATUS as batchStatus,mam.GPS_CODE as gpsCode,mam.MAKE_ORDER_DATE as makeOrderDate,mam.INVOICE_DATE as
+        invoiceDate,mam.QRCODE as qrcode,mam.DEVICE_TYPE as deviceType
+        ,org.NAME companyName,mam.ORIGIN_NUM originNum,rel.ORG_ID orgId ,mam.GPS_CODE ,flow.OPERTER_TIME
+        optTime,flow.OPERTER,user.`NAME` ,user.LOGIN_NAME userName
+        ,flow.GIS_CODE gisCode,flow.type gisType
+        from ma_gis_code_flow flow
+        LEFT JOIN mm_machines mam on flow.MA_ID=mam.id
+        LEFT JOIN ma_status mas on mam.BATCH_STATUS = mas.BATCH_STATUS
+        left join pm_user user on user.id=flow.OPERTER
+        LEFT JOIN mm_type mat on mam.TYPE = mat.ID
+        LEFT JOIN mm_type matt on matt.ID = mat.PARENT_ID
+        LEFT JOIN ma_org_relation rel on rel.TYPE_ID=mat.ID
+        LEFT JOIN pm_organization org on org.ID=rel.ORG_ID
+        where 1=1 and mam.id is not null
+        <if test='param.orgId !=null and param.orgId!="" and   param.orgId !="1" '>
+            and rel.ORG_ID=#{param.orgId}
+        </if>
+        <if test="param.batchStatus != 0">
+            and mas.MA_STATUS = #{param.batchStatus}
+        </if>
+        <if test="param.deviceType != 0">
+            and mam.DEVICE_TYPE = #{param.deviceType}
+        </if>
+        <if test="param.typeName != null and param.typeName != ''">
+            and matt.`NAME` LIKE CONCAT('%', #{param.typeName},'%')
+        </if>
+        <if test="param.type != null and param.type != ''">
+            and mat.`NAME` LIKE CONCAT('%',#{param.type},'%')
+        </if>
+        <if test="param.keyWord !=null and param.keyWord !=''">
+            and (
+            matt.`NAME` LIKE CONCAT('%',#{param.keyWord},'%') OR
+            mam.DEVICE_CODE LIKE CONCAT('%',#{param.keyWord},'%') OR
+            mat.`NAME` LIKE CONCAT('%',#{param.keyWord},'%') OR
+            mam.QRCODE LIKE CONCAT('%',#{param.keyWord},'%') OR
+            mam.BATCH_STATUS LIKE CONCAT('%',#{param.keyWord},'%') OR
+            flow.GIS_CODE LIKE CONCAT('%',#{param.keyWord},'%') OR
+            user.LOGIN_NAME LIKE CONCAT('%',#{param.keyWord},'%') OR
+            org.NAME LIKE CONCAT('%',#{param.keyWord},'%')
+            )
+        </if>

- 	</select>
+    </select>
 	
 	
 	<select id="getGisCodeBylist"  parameterType="com.bonus.ma.beans.GpsBindingBean" resultMap="gisBean">
--- a/resources/mybatis/scrap/ScrapApplyMapper.xml
+++ b/resources/mybatis/scrap/ScrapApplyMapper.xml
@ -28,7 +28,9 @@
 			AND(
 				wsa.`CODE` LIKE CONCAT('%',#{param.keyWord},'%')
 				OR wsa.CREATOR LIKE CONCAT('%',#{param.keyWord},'%')	
-				OR wsa.APPLY_REMARK LIKE CONCAT('%',#{param.keyWord},'%')	
+				OR wsa.APPLY_REMARK LIKE CONCAT('%',#{param.keyWord},'%')
+			    OR pu.`NAME` LIKE CONCAT('%',#{param.keyWord},'%')
+			    OR mt2.`NAME` LIKE CONCAT('%',#{param.keyWord},'%')
 			)
 		</if>
 		GROUP BY wsa.id
--- a/resources/mybatis/scrap/ScrapAuditMapper.xml
+++ b/resources/mybatis/scrap/ScrapAuditMapper.xml
@ -29,42 +29,46 @@
  </resultMap>
 	
 	<select id="findByPage" resultMap="scrap" parameterType="com.bonus.scrap.beans.ScrapAuditBean">
-		
-	    SELECT
-			wsa.ID,
-			wsa.`CODE`,
-			wsa.CREATE_TIME AS applyTime,
-			wsa.apply_remark AS applyRemark,
-			
-			pu.`NAME` AS applyer,
-			pu2.`NAME` AS auditor,
-			wsa.AUDIT_TIME AS auditTime,
-			wsa.AUDIT_REMARK AS auditRemark ,
-			wsa.`STATUS`,
-			GROUP_CONCAT(DISTINCT mt2.`NAME`) as typeName
-			
-		FROM
-		wf_scrap_apply wsa
-		LEFT JOIN scrap_apply_details sad ON sad.apply_id = wsa.ID
-		LEFT JOIN mm_type mt ON mt.ID = sad.type_id
-		LEFT JOIN mm_type mt2 ON mt2.ID = mt.PARENT_ID
-		LEFT JOIN pm_user pu on wsa.CREATOR = pu.ID
-		LEFT JOIN pm_user pu2 on wsa.AUDITOR = pu2.ID 
-		where wsa.`STATUS` in (0,1,2)
-		<if test="param.status != null and param.status != ''">
-			AND wsa.status = #{param.status}
-		</if>
-		<if test="param.keyWord != null and param.keyWord != ''">
-			AND (
-				 	wsa.`CODE` LIKE CONCAT('%',#{param.keyWord},'%')
-				 or pu.`NAME` LIKE CONCAT('%',#{param.keyWord},'%')
-				 or pu2.`NAME` LIKE CONCAT('%',#{param.keyWord},'%')
-				
-			)
-		</if>
-		GROUP BY wsa.ID
-		order by wsa.ID desc
-	</select>
+
+        SELECT
+        wsa.ID,
+        wsa.`CODE`,
+        wsa.CREATE_TIME AS applyTime,
+        wsa.apply_remark AS applyRemark,
+
+        pu.`NAME` AS applyer,
+        pu2.`NAME` AS auditor,
+        wsa.AUDIT_TIME AS auditTime,
+        wsa.AUDIT_REMARK AS auditRemark ,
+        wsa.`STATUS`,
+        GROUP_CONCAT(DISTINCT mt2.`NAME`) as typeName
+
+        FROM
+        wf_scrap_apply wsa
+        LEFT JOIN scrap_apply_details sad ON sad.apply_id = wsa.ID
+        LEFT JOIN mm_type mt ON mt.ID = sad.type_id
+        LEFT JOIN mm_type mt2 ON mt2.ID = mt.PARENT_ID
+        LEFT JOIN pm_user pu on wsa.CREATOR = pu.ID
+        LEFT JOIN pm_user pu2 on wsa.AUDITOR = pu2.ID
+        where wsa.`STATUS` in (0,1,2)
+        <if test="param.status != null and param.status != ''">
+            AND wsa.status = #{param.status}
+        </if>
+        <if test="param.keyWord != null and param.keyWord != ''">
+            AND (
+            wsa.`CODE` LIKE CONCAT('%',#{param.keyWord},'%')
+            or pu.`NAME` LIKE CONCAT('%',#{param.keyWord},'%')
+            or pu2.`NAME` LIKE CONCAT('%',#{param.keyWord},'%')
+            OR wsa.CREATOR LIKE CONCAT('%',#{param.keyWord},'%')
+            OR wsa.APPLY_REMARK LIKE CONCAT('%',#{param.keyWord},'%')
+            OR pu.`NAME` LIKE CONCAT('%',#{param.keyWord},'%')
+            OR mt2.`NAME` LIKE CONCAT('%',#{param.keyWord},'%')
+
+            )
+        </if>
+        GROUP BY wsa.ID
+        order by wsa.ID desc
+    </select>
 	
 	<select id="findScrapApplyById" resultMap="baseResultMap" parameterType="com.bonus.scrap.beans.ScrapAuditBean">
 	
--- a/src/com/bonus/bm/service/ProjectManageServiceImp.java
+++ b/src/com/bonus/bm/service/ProjectManageServiceImp.java
@ -13,58 +13,73 @@ import com.bonus.sys.beans.ZNode;
@Service("ProjectManageService")
 public class ProjectManageServiceImp extends BaseServiceImp<ProjectManageBean> implements ProjectManageService {

-	@Autowired
-	private ProjectManageDao pmDao;
+    @Autowired
+    private ProjectManageDao pmDao;

-	@Override
-	public List<ProjectManageBean> getVolLever() {
-		return pmDao.getVolLever();
-	}
+    @Override
+    public List<ProjectManageBean> getVolLever() {
+        return pmDao.getVolLever();
+    }

-	@Override
-	public List<ProjectManageBean> getProjectType() {
-		return pmDao.getProjectType();
-	}
+    @Override
+    public List<ProjectManageBean> getProjectType() {
+        return pmDao.getProjectType();
+    }

-	@Override
-	public List<ZNode> findWorkTree() {
-		return pmDao.findWorkTree();
-	}
+    @Override
+    public List<ZNode> findWorkTree() {
+        return pmDao.findWorkTree();
+    }

-	@Override
-	public List<ProjectManageBean> getProjectName(ProjectManageBean o) {
-		return pmDao.getProjectName(o);
-	}
+    @Override
+    public List<ProjectManageBean> getProjectName(ProjectManageBean o) {
+        return pmDao.getProjectName(o);
+    }

-	@Override
-	public List<ZNode> projectTree(ProjectManageBean o) {
-		return pmDao.projectTree(o);
-	}
+    @Override
+    public List<ZNode> projectTree(ProjectManageBean o) {
+        return pmDao.projectTree(o);
+    }

-	@Override
-	public List<ZNode> projectTreeByUnitId(ProjectManageBean o) {
-		return pmDao.projectTreeByUnitId(o);
-	}
+    @Override
+    public List<ZNode> projectTreeByUnitId(ProjectManageBean o) {
+        return pmDao.projectTreeByUnitId(o);
+    }

-	@Override
-	public ProjectManageBean findByName(String name) {
-		return pmDao.findByName(name);
-	}
+    @Override
+    public ProjectManageBean findByName(String name) {
+        return pmDao.findByName(name);
+    }

-	@Override
-	public List<ProjectManageBean> getProvinces() {
-		return pmDao.getProvinces();
-	}
+    @Override
+    public void updateProject(String num, String id) {
+        pmDao.updateProject(num, id);
+    }

-	@Override
-	public List<ProjectManageBean> getCities(ProjectManageBean o) {
-		return pmDao.getCities(o);
-	}
+    @Override
+    public List<ProjectManageBean> getProvinces() {
+        return pmDao.getProvinces();
+    }

-	@Override
-	public List<ProjectManageBean> getDistricts(ProjectManageBean o) {
-		return pmDao.getDistricts(o);
-	}
+    @Override
+    public List<ProjectManageBean> getCities(ProjectManageBean o) {
+        return pmDao.getCities(o);
+    }
+
+    @Override
+    public List<ProjectManageBean> getDistricts(ProjectManageBean o) {
+        return pmDao.getDistricts(o);
+    }
+
+    @Override
+    public ProjectManageBean findByCode(String projectCode) {
+        return pmDao.findByCode(projectCode);
+    }
+
+    @Override
+    public void updateProjectName(String projectName, String projectCode) {
+        pmDao.updateProjectName(projectName, projectCode);
+    }

 	@Override
 	public int updateBidId(ProjectManageBean o) {