修改派单规则子表表名

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/controller/AppraisalController.java

@@ -205,8 +205,8 @@ public class AppraisalController {
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "nu_biz_nu_directive_order_sub通过主表ID查询")
+	//@AutoLog(value = "nu_biz_nu_directive_order_info通过主表ID查询")
-	@ApiOperation(value="nu_biz_nu_directive_order_sub主表ID查询", notes="nu_biz_nu_directive_order_sub-通主表ID查询")
+	@ApiOperation(value="nu_biz_nu_directive_order_info主表ID查询", notes="nu_biz_nu_directive_order_info-通主表ID查询")
 	@GetMapping(value = "/queryAppraisalSubByMainId")
 	public Result<List<AppraisalSub>> queryNuBizNuAppraisalSubListByMainId(@RequestParam(name="id",required=true) String id) {
 		List<AppraisalSub> nuBizNuAppraisalSubList = subService.selectByMainId(id);

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/entity/AppraisalSub.java

@@ -22,9 +22,9 @@ import java.io.UnsupportedEncodingException;
  * @Date:   2026-01-23
  * @Version: V1.0
  */
-@ApiModel(value="nu_biz_nu_directive_order_sub对象", description="服务考核子表")
+@ApiModel(value="nu_biz_nu_directive_order_info对象", description="服务考核子表")
 @Data
-@TableName("nu_biz_nu_directive_order_sub")
+@TableName("nu_biz_nu_directive_order_info")
 public class AppraisalSub implements Serializable {
     private static final long serialVersionUID = 1L;
 

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/mapper/xml/AppraisalMapper.xml

@@ -221,7 +221,7 @@
                s.manually_pic_path      as sub_manually_pic_path,
                s.manually_mp4_path      as sub_manually_mp4_path
         FROM nu_biz_nu_directive_order o
-        LEFT JOIN nu_biz_nu_directive_order_sub s ON o.id = s.main_id
+        LEFT JOIN nu_biz_nu_directive_order_info s ON o.id = s.main_id
     </sql>
 
     <select id="findPage" resultMap="AppraisalMap">

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/mapper/xml/AppraisalSubMapper.xml

@@ -4,13 +4,13 @@
 
 	<delete id="deleteByMainId" parameterType="java.lang.String">
 		DELETE 
-		FROM  nu_biz_nu_directive_order_sub 
+		FROM  nu_biz_nu_directive_order_info
 		WHERE
 			 main_id = #{mainId} 	</delete>
 	
 	<select id="selectByMainId" parameterType="java.lang.String" resultType="com.nu.modules.biz.appraisal.entity.AppraisalSub">
 		SELECT * 
-		FROM  nu_biz_nu_directive_order_sub
+		FROM  nu_biz_nu_directive_order_info
 		WHERE
 			 main_id = #{mainId} 	</select>
 </mapper>

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml

@@ -350,7 +350,7 @@
     </update>
 
     <update id="deleteOrdersSub">
-        delete from nu_biz_nu_directive_order_sub a
+        delete from nu_biz_nu_directive_order_info a
         where main_id = #{id}
     </update>
 

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrderSub.java

@@ -22,10 +22,10 @@ import java.util.Date;
  * @Version: V1.0
  */
 @Data
-@TableName("nu_biz_nu_directive_order_sub")
+@TableName("nu_biz_nu_directive_order_info")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="nu_biz_nu_directive_order_sub对象", description="服务指令工单子表")
+@ApiModel(value="nu_biz_nu_directive_order_info对象", description="服务指令工单子表")
 public class DirectiveOrderSub implements Serializable {
     private static final long serialVersionUID = 1L;
     /**id*/

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml

@@ -195,14 +195,14 @@
                    round(sum(ifnull(com_price,0)),4) as totalComPrice,
                    max(start_time) as maxTime,
                    sum(case when iz_finish='N' then 1 else 0 end) as ownCn
-            from nu_biz_nu_directive_order_sub
+            from nu_biz_nu_directive_order_info
             where start_time >=DATE_FORMAT(NOW(), '%Y-%m-%d 00:00:00')
             and start_time <=DATE_FORMAT(NOW(), '%Y-%m-%d 23:59:59')
             group by employee_id
         ) e on a.id = e.employee_id
         left join (
             select employee_id,sum(case when iz_finish='N' then 1 else 0 end) as orderNum
-            from nu_biz_nu_directive_order_sub
+            from nu_biz_nu_directive_order_info
             where start_time = #{startTime}
             or (start_time < #{startTime} and end_time > #{startTime})
             group by employee_id
@@ -272,7 +272,7 @@
     </select>
     <select id="queryTodayFinishedTotal" resultType="java.lang.Integer">
         SELECT COUNT(*) as total_count
-        FROM nu_biz_nu_directive_order_sub
+        FROM nu_biz_nu_directive_order_info
         <where>
             iz_finish = 'Y'
             AND DATE(start_time) = CURDATE()
@@ -395,7 +395,7 @@
                s.manually_pic_path      as sub_manually_pic_path,
                s.manually_mp4_path      as sub_manually_mp4_path
         FROM nu_biz_nu_directive_order o
-                 LEFT JOIN nu_biz_nu_directive_order_sub s ON o.id = s.main_id
+                 LEFT JOIN nu_biz_nu_directive_order_info s ON o.id = s.main_id
                  LEFT JOIN sys_dict dict ON dict.dict_code = 'directive_order_opt_type'
                  LEFT JOIN sys_dict_item mainStatus ON mainStatus.dict_id = dict.id AND mainStatus.item_value = o.opt_type
         WHERE o.order_type = '1'

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderSubMapper.xml

@@ -60,7 +60,7 @@
 
 
     <select id="queryOrderInfoList" resultType="com.nu.modules.biz.order.entity.DirectiveOrderSub">
-        select a.*,b.immediate_file,b.immediate_file_focus from nu_biz_nu_directive_order_sub a left join nu_config_service_directive b on a.directive_id = b.id
+        select a.*,b.immediate_file,b.immediate_file_focus from nu_biz_nu_directive_order_info a left join nu_config_service_directive b on a.directive_id = b.id
         ${ew.customSqlSegment}
     </select>
 

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java

@@ -9,9 +9,9 @@ import com.nu.modules.biz.order.mapper.DirectiveOrderMapper;
 import com.nu.modules.biz.order.service.IDirectiveOrderService;
 import com.nu.modules.biz.order.service.IDirectiveOrderSubService;
 import com.nu.modules.config.sendorderrule.entity.SendOrderRule;
-import com.nu.modules.config.sendorderrule.entity.SendOrderRuleSub;
+import com.nu.modules.config.sendorderrule.entity.SendOrderRuleInfo;
 import com.nu.modules.config.sendorderrule.service.ISendOrderRuleService;
-import com.nu.modules.config.sendorderrule.service.ISendOrderRuleSubService;
+import com.nu.modules.config.sendorderrule.service.ISendOrderRuleInfoService;
 import com.nu.websocket.SdWebsocket;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
@@ -41,11 +41,11 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
     @Autowired
     ISendOrderRuleService sendOrderRuleService;
     @Autowired
-    ISendOrderRuleSubService sendOrderRuleSubService;
+    ISendOrderRuleInfoService sendOrderRuleSubService;
     @Autowired
     private ISysBaseAPI sysBaseAPI;
     SendOrderRule sendOrderRule;
-    List<SendOrderRuleSub> ruleSubList;
+    List<SendOrderRuleInfo> ruleSubList;
 
     @Autowired
     private SdWebsocket sdWebsocket;
@@ -58,7 +58,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
             QueryWrapper<SendOrderRule> qw = new QueryWrapper<>();
             qw.eq("iz_enabled", "Y");
             sendOrderRule = sendOrderRuleService.getOne(qw);
-            QueryWrapper<SendOrderRuleSub> subqw = new QueryWrapper<>();
+            QueryWrapper<SendOrderRuleInfo> subqw = new QueryWrapper<>();
             subqw.eq("iz_enabled", "Y");
             subqw.eq("main_id", sendOrderRule.getId());
             subqw.orderByAsc("sort");
@@ -324,7 +324,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
 //                System.out.println("员工信息:" + emp.getEmployeeName() + "," + emp.getOrderCap() + "," + emp.getOrderNum() + "," + emp.getTotalDuration() + "," + emp.getTotalComPrice() + "," + emp.getMaxTime() + "," + emp.getOwnCn() + "," + emp.getIzFree());
 //            }
             if (ruleSubList.size() > 0) {
-                for (SendOrderRuleSub ruleSub : ruleSubList) {
+                for (SendOrderRuleInfo ruleSub : ruleSubList) {
                     switch (ruleSub.getRuleCode()) {
                         case 1:
                             //空闲积分
@@ -387,7 +387,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
             getByOrderly(empList, elderId);
             if (empList.size() > 0) {
                 if (ruleSubList.size() > 0) {
-                    for (SendOrderRuleSub ruleSub : ruleSubList) {
+                    for (SendOrderRuleInfo ruleSub : ruleSubList) {
                         switch (ruleSub.getRuleCode()) {
                             case 1:
                                 //空闲积分

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderrule/controller/SendOrderRuleInfoController.java

@@ -3,12 +3,11 @@ package com.nu.modules.config.sendorderrule.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.nu.modules.config.sendorderrule.entity.SendOrderRuleSub;
+import com.nu.modules.config.sendorderrule.entity.SendOrderRuleInfo;
-import com.nu.modules.config.sendorderrule.service.ISendOrderRuleSubService;
+import com.nu.modules.config.sendorderrule.service.ISendOrderRuleInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
@@ -29,16 +28,16 @@ import java.util.Arrays;
  */
 @Api(tags="服务指令-派单规则配置子表")
 @RestController
-@RequestMapping("/sendorderrule/sendOrderRuleSub")
+@RequestMapping("/sendorderrule/sendOrderRuleInfo")
 @Slf4j
-public class SendOrderRuleSubController extends JeecgController<SendOrderRuleSub, ISendOrderRuleSubService> {
+public class SendOrderRuleInfoController extends JeecgController<SendOrderRuleInfo, ISendOrderRuleInfoService> {
 	@Autowired
-	private ISendOrderRuleSubService sendOrderRuleSubService;
+	private ISendOrderRuleInfoService sendOrderRuleInfoService;
 
 	/**
 	 * 分页列表查询
 	 *
-	 * @param sendOrderRuleSub
+	 * @param sendOrderRuleInfo
 	 * @param pageNo
 	 * @param pageSize
 	 * @param req
@@ -47,42 +46,42 @@ public class SendOrderRuleSubController extends JeecgController<SendOrderRuleSub
 	//@AutoLog(value = "服务指令-派单规则配置子表-分页列表查询")
 	@ApiOperation(value="服务指令-派单规则配置子表-分页列表查询", notes="服务指令-派单规则配置子表-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<SendOrderRuleSub>> queryPageList(SendOrderRuleSub sendOrderRuleSub,
+	public Result<IPage<SendOrderRuleInfo>> queryPageList(SendOrderRuleInfo sendOrderRuleInfo,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
+														  HttpServletRequest req) {
-        QueryWrapper<SendOrderRuleSub> queryWrapper = QueryGenerator.initQueryWrapper(sendOrderRuleSub, req.getParameterMap());
+        QueryWrapper<SendOrderRuleInfo> queryWrapper = QueryGenerator.initQueryWrapper(sendOrderRuleInfo, req.getParameterMap());
-		Page<SendOrderRuleSub> page = new Page<SendOrderRuleSub>(pageNo, pageSize);
+		Page<SendOrderRuleInfo> page = new Page<SendOrderRuleInfo>(pageNo, pageSize);
 		queryWrapper.orderByAsc("sort");
-		IPage<SendOrderRuleSub> pageList = sendOrderRuleSubService.page(page, queryWrapper);
+		IPage<SendOrderRuleInfo> pageList = sendOrderRuleInfoService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 
 	/**
 	 *   添加
 	 *
-	 * @param sendOrderRuleSub
+	 * @param sendOrderRuleInfo
 	 * @return
 	 */
 	@AutoLog(value = "服务指令-派单规则配置子表-添加")
 	@ApiOperation(value="服务指令-派单规则配置子表-添加", notes="服务指令-派单规则配置子表-添加")
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody SendOrderRuleSub sendOrderRuleSub) {
+	public Result<String> add(@RequestBody SendOrderRuleInfo sendOrderRuleInfo) {
-		sendOrderRuleSubService.save(sendOrderRuleSub);
+		sendOrderRuleInfoService.save(sendOrderRuleInfo);
 		return Result.OK("添加成功！");
 	}
 
 	/**
 	 *  编辑
 	 *
-	 * @param sendOrderRuleSub
+	 * @param sendOrderRuleInfo
 	 * @return
 	 */
 	@AutoLog(value = "服务指令-派单规则配置子表-编辑")
 	@ApiOperation(value="服务指令-派单规则配置子表-编辑", notes="服务指令-派单规则配置子表-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody SendOrderRuleSub sendOrderRuleSub) {
+	public Result<String> edit(@RequestBody SendOrderRuleInfo sendOrderRuleInfo) {
-		sendOrderRuleSubService.updateById(sendOrderRuleSub);
+		sendOrderRuleInfoService.updateById(sendOrderRuleInfo);
 		return Result.OK("编辑成功!");
 	}
 
@@ -96,7 +95,7 @@ public class SendOrderRuleSubController extends JeecgController<SendOrderRuleSub
 	@ApiOperation(value="服务指令-派单规则配置子表-通过id删除", notes="服务指令-派单规则配置子表-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		sendOrderRuleSubService.removeById(id);
+		sendOrderRuleInfoService.removeById(id);
 		return Result.OK("删除成功!");
 	}
 
@@ -110,7 +109,7 @@ public class SendOrderRuleSubController extends JeecgController<SendOrderRuleSub
 	@ApiOperation(value="服务指令-派单规则配置子表-批量删除", notes="服务指令-派单规则配置子表-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.sendOrderRuleSubService.removeByIds(Arrays.asList(ids.split(",")));
+		this.sendOrderRuleInfoService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
 
@@ -123,23 +122,23 @@ public class SendOrderRuleSubController extends JeecgController<SendOrderRuleSub
 	//@AutoLog(value = "服务指令-派单规则配置子表-通过id查询")
 	@ApiOperation(value="服务指令-派单规则配置子表-通过id查询", notes="服务指令-派单规则配置子表-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<SendOrderRuleSub> queryById(@RequestParam(name="id",required=true) String id) {
+	public Result<SendOrderRuleInfo> queryById(@RequestParam(name="id",required=true) String id) {
-		SendOrderRuleSub sendOrderRuleSub = sendOrderRuleSubService.getById(id);
+		SendOrderRuleInfo sendOrderRuleInfo = sendOrderRuleInfoService.getById(id);
-		if(sendOrderRuleSub==null) {
+		if(sendOrderRuleInfo==null) {
 			return Result.error("未找到对应数据");
 		}
-		return Result.OK(sendOrderRuleSub);
+		return Result.OK(sendOrderRuleInfo);
 	}
 
     /**
     * 导出excel
     *
     * @param request
-    * @param sendOrderRuleSub
+    * @param sendOrderRuleInfo
     */
     @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, SendOrderRuleSub sendOrderRuleSub) {
+    public ModelAndView exportXls(HttpServletRequest request, SendOrderRuleInfo sendOrderRuleInfo) {
-        return super.exportXls(request, sendOrderRuleSub, SendOrderRuleSub.class, "服务指令-派单规则配置子表");
+        return super.exportXls(request, sendOrderRuleInfo, SendOrderRuleInfo.class, "服务指令-派单规则配置子表");
     }
 
     /**
@@ -151,7 +150,7 @@ public class SendOrderRuleSubController extends JeecgController<SendOrderRuleSub
     */
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, SendOrderRuleSub.class);
+        return super.importExcel(request, response, SendOrderRuleInfo.class);
     }
 
 }

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderrule/entity/SendOrderRule.java

@@ -68,5 +68,5 @@ public class SendOrderRule implements Serializable {
     private java.lang.String delFlag;
 
     @TableField(exist = false)
-    private List<SendOrderRuleSub> sendOrderRuleSubList;
+    private List<SendOrderRuleInfo> sendOrderRuleSubList;
 }

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderrule/entity/SendOrderRuleInfo.java

@@ -23,11 +23,11 @@ import java.io.Serializable;
  * @Version: V1.0
  */
 @Data
-@TableName("nu_config_service_send_order_rule_sub")
+@TableName("nu_config_service_send_order_rule_info")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "nu_config_service_send_order_rule_sub对象", description = "服务指令-派单规则配置子表")
+@ApiModel(value = "nu_config_service_send_order_rule_info对象", description = "服务指令-派单规则配置子表")
-public class SendOrderRuleSub implements Serializable {
+public class SendOrderRuleInfo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderrule/mapper/SendOrderRuleInfoMapper.java

@@ -1,7 +1,7 @@
 package com.nu.modules.config.sendorderrule.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.nu.modules.config.sendorderrule.entity.SendOrderRuleSub;
+import com.nu.modules.config.sendorderrule.entity.SendOrderRuleInfo;
 
 /**
  * @Description: 派单规则配置子表
@@ -9,6 +9,6 @@ import com.nu.modules.config.sendorderrule.entity.SendOrderRuleSub;
  * @Date:   2025-12-1
  * @Version: V1.0
  */
-public interface SendOrderRuleSubMapper extends BaseMapper<SendOrderRuleSub> {
+public interface SendOrderRuleInfoMapper extends BaseMapper<SendOrderRuleInfo> {
     
 }

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderrule/mapper/xml/SendOrderRuleInfoMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.nu.modules.config.sendorderrule.mapper.SendOrderRuleSubMapper">
+<mapper namespace="com.nu.modules.config.sendorderrule.mapper.SendOrderRuleInfoMapper">
 
 </mapper>

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderrule/service/ISendOrderRuleInfoService.java

@@ -1,7 +1,7 @@
 package com.nu.modules.config.sendorderrule.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.nu.modules.config.sendorderrule.entity.SendOrderRuleSub;
+import com.nu.modules.config.sendorderrule.entity.SendOrderRuleInfo;
 
 /**
  * @Description: 服务指令-派单规则配置子表
@@ -9,6 +9,6 @@ import com.nu.modules.config.sendorderrule.entity.SendOrderRuleSub;
  * @Date:   2025-12-1
  * @Version: V1.0
  */
-public interface ISendOrderRuleSubService extends IService<SendOrderRuleSub> {
+public interface ISendOrderRuleInfoService extends IService<SendOrderRuleInfo> {
 
 }

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderrule/service/impl/SendOrderRuleInfoServiceImpl.java

@@ -1,9 +1,9 @@
 package com.nu.modules.config.sendorderrule.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.nu.modules.config.sendorderrule.entity.SendOrderRuleSub;
+import com.nu.modules.config.sendorderrule.entity.SendOrderRuleInfo;
-import com.nu.modules.config.sendorderrule.mapper.SendOrderRuleSubMapper;
+import com.nu.modules.config.sendorderrule.mapper.SendOrderRuleInfoMapper;
-import com.nu.modules.config.sendorderrule.service.ISendOrderRuleSubService;
+import com.nu.modules.config.sendorderrule.service.ISendOrderRuleInfoService;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,6 +13,6 @@ import org.springframework.stereotype.Service;
  * @Version: V1.0
  */
 @Service
-public class SendOrderRuleSubServiceImpl extends ServiceImpl<SendOrderRuleSubMapper, SendOrderRuleSub> implements ISendOrderRuleSubService {
+public class SendOrderRuleInfoServiceImpl extends ServiceImpl<SendOrderRuleInfoMapper, SendOrderRuleInfo> implements ISendOrderRuleInfoService {
 
 }