删除无用修改-sjx

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/EnergyQuotaController.java

@@ -64,7 +64,7 @@ import jakarta.servlet.http.HttpServletResponse;
 @AllArgsConstructor
 @RequestMapping("/bsEnergyQuota")
 @Tag(name = "能源定额", description = "能源定额接口")
-public class BsEnergyQuotaController extends BladeController {
+public class EnergyQuotaController extends BladeController {
 
 	private final IBsEnergyQuotaService bsEnergyQuotaService;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/EnergyTargetController.java

@@ -64,7 +64,7 @@ import jakarta.servlet.http.HttpServletResponse;
 @AllArgsConstructor
 @RequestMapping("/bsEnergyTarget")
 @Tag(name = "能耗目标表", description = "能耗目标表接口")
-public class BsEnergyTargetController extends BladeController {
+public class EnergyTargetController extends BladeController {
 
 	private final IBsEnergyTargetService bsEnergyTargetService;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyQuotaMapper.java

@@ -40,7 +40,7 @@ import java.util.List;
  * @author BladeX
  * @since 2026-03-02
  */
-public interface BsEnergyQuotaMapper extends BaseMapper<BsEnergyQuotaEntity> {
+public interface EnergyQuotaMapper extends BaseMapper<BsEnergyQuotaEntity> {
 
 	/**
 	 * 自定义分页

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyTargetMapper.java

@@ -40,7 +40,7 @@ import java.util.List;
  * @author BladeX
  * @since 2026-03-02
  */
-public interface BsEnergyTargetMapper extends BaseMapper<BsEnergyTargetEntity> {
+public interface EnergyTargetMapper extends BaseMapper<BsEnergyTargetEntity> {
 
 	/**
 	 * 自定义分页

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/EnergyQuotaServiceImpl.java

@@ -28,7 +28,7 @@ package org.springblade.desk.energy.service.impl;
 import org.springblade.desk.energy.pojo.entity.BsEnergyQuotaEntity;
 import org.springblade.desk.energy.pojo.vo.BsEnergyQuotaVO;
 import org.springblade.desk.energy.excel.BsEnergyQuotaExcel;
-import org.springblade.desk.energy.mapper.BsEnergyQuotaMapper;
+import org.springblade.desk.energy.mapper.EnergyQuotaMapper;
 import org.springblade.desk.energy.service.IBsEnergyQuotaService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -43,7 +43,7 @@ import java.util.List;
  * @since 2026-03-02
  */
 @Service
-public class BsEnergyQuotaServiceImpl extends BaseServiceImpl<BsEnergyQuotaMapper, BsEnergyQuotaEntity> implements IBsEnergyQuotaService {
+public class EnergyQuotaServiceImpl extends BaseServiceImpl<EnergyQuotaMapper, BsEnergyQuotaEntity> implements IBsEnergyQuotaService {
 
 	@Override
 	public IPage<BsEnergyQuotaVO> selectBsEnergyQuotaPage(IPage<BsEnergyQuotaVO> page, BsEnergyQuotaVO bsEnergyQuota) {

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/EnergyTargetServiceImpl.java

@@ -28,7 +28,7 @@ package org.springblade.desk.energy.service.impl;
 import org.springblade.desk.energy.pojo.entity.BsEnergyTargetEntity;
 import org.springblade.desk.energy.pojo.vo.BsEnergyTargetVO;
 import org.springblade.desk.energy.excel.BsEnergyTargetExcel;
-import org.springblade.desk.energy.mapper.BsEnergyTargetMapper;
+import org.springblade.desk.energy.mapper.EnergyTargetMapper;
 import org.springblade.desk.energy.service.IBsEnergyTargetService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -43,7 +43,7 @@ import java.util.List;
  * @since 2026-03-02
  */
 @Service
-public class BsEnergyTargetServiceImpl extends BaseServiceImpl<BsEnergyTargetMapper, BsEnergyTargetEntity> implements IBsEnergyTargetService {
+public class EnergyTargetServiceImpl extends BaseServiceImpl<EnergyTargetMapper, BsEnergyTargetEntity> implements IBsEnergyTargetService {
 
 	@Override
 	public IPage<BsEnergyTargetVO> selectBsEnergyTargetPage(IPage<BsEnergyTargetVO> page, BsEnergyTargetVO bsEnergyTarget) {

blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/ProjectApplicationMapper.xml

@@ -46,6 +46,7 @@
                 and n.PROJECT_HEAD = #{fmProjectApplication.projectHead}
             </if>
         </where>
+        order by n.create_time desc
     </select>
 
 

blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectMilestoneServiceImpl.java

@@ -34,6 +34,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
+import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.desk.process.excel.FmProjectMilestoneExcel;
@@ -45,6 +46,8 @@ import org.springblade.desk.process.service.IFmProjectApplicationService;
 import org.springblade.desk.process.service.IFmProjectMilestoneService;
 import org.springblade.resource.feign.IAttachClient;
 import org.springblade.resource.pojo.entity.Attach;
+import org.springblade.system.feign.IUserClient;
+import org.springblade.system.pojo.entity.User;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -64,6 +67,7 @@ public class FmProjectMilestoneServiceImpl extends BaseServiceImpl<FmProjectMile
 	private final IFmProjectApplicationService fmProjectApplicationService;
 
 	private final IAttachClient attachClient;
+	private final IUserClient userClient;
 	@Override
 	public IPage<FmProjectMilestoneVO> selectFmProjectMilestonePage(IPage<FmProjectMilestoneVO> page, FmProjectMilestoneVO fmProjectMilestone) {
 		return page.setRecords(baseMapper.selectFmProjectMilestonePage(page, fmProjectMilestone));
@@ -107,7 +111,9 @@ public class FmProjectMilestoneServiceImpl extends BaseServiceImpl<FmProjectMile
 	@Override
 	public boolean gradeSubmit(FmProjectMilestoneEntity fmProjectMilestone) {
 		if (fmProjectMilestone != null && fmProjectMilestone.getId() != null) {
-			fmProjectMilestone.setGradeMan(String.valueOf(AuthUtil.getUser().getUserId()));
+			BladeUser bladeUser = AuthUtil.getUser();
+			User user = userClient.userInfoById(bladeUser.getUserId()).getData();
+			fmProjectMilestone.setGradeMan(user.getRealName());
 			Double score= fmProjectMilestone.getScore();
 			fmProjectMilestone.setScore(score);
 
@@ -125,7 +131,8 @@ public class FmProjectMilestoneServiceImpl extends BaseServiceImpl<FmProjectMile
 			// 如果评价分数在75分以上，并且执行类型不是延期。则代表本节点已经完成
 			if (score < 75 && !FmProjectMilestoneEntity.EXECUTE_RESULT_YQ.equals(fmProjectMilestone.getExecuteResult())) {
 				fmProjectMilestone.setCheckResult(FmProjectMilestoneEntity.CHECK_RESULT_TREAT);
-				return false;
+				baseMapper.updateById(fmProjectMilestone);
+				return true;
 			}
 			baseMapper.updateById(fmProjectMilestone);
 			// 如果选择的是延期，则生成一条新的里程碑，此里程碑关闭

blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStMeasuringMaintenService.java

@@ -1,45 +0,0 @@
-package org.springblade.wms.service;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.mp.base.BaseService;
-import org.springblade.core.secure.BladeUser;
-import org.springblade.wms.excel.StMeasuringMaintenExcel;
-import org.springblade.wms.pojo.entity.StMeasuringMainten;
-import org.springblade.wms.pojo.vo.StMeasuringMaintenVO;
-
-import java.util.List;
-
-/**
- * @version 1.0
- * @program: jonhon-mes-svr
- * @ClassName IStMeasuringMaintenService
- * @description: 量具保养表 服务类
- * @autor: WuSiYu
- * @create 2025-12-26 13:17
- **/
-
-public interface IStMeasuringMaintenService extends BaseService<StMeasuringMainten> {
-	/**
-	 * 自定义分页
-	 *
-	 * @param page 分页参数
-	 * @param stMeasuringMainten 查询参数
-	 * @return IPage<StMeasuringMaintenVO>
-	 */
-	IPage<StMeasuringMaintenVO> selectStMeasuringMaintenPage(IPage<StMeasuringMaintenVO> page, StMeasuringMaintenVO stMeasuringMainten);
-
-
-	/**
-	 * 导出数据
-	 *
-	 * @param queryWrapper 查询条件
-	 * @return List<StMeasuringMaintenExcel>
-	 */
-	List<StMeasuringMaintenExcel> exportStMeasuringMainten(Wrapper<StMeasuringMainten> queryWrapper);
-
-    boolean saveData(List<Long> rlsIds, BladeUser user);
-
-	boolean maintenanceAppFun(List<Long> mmIdLst, BladeUser user);
-}
-