1、员工增加接单上限设置

2、长者增加指派护理人员

nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/controller/ElderInfoController.java

@@ -69,7 +69,7 @@ public class ElderInfoController extends JeecgController<ElderInfo, IElderInfoSe
     /**
      * 分页列表查询
      *
-     * @param employeesApply
+     * @param nuBizCustomerInfo
      * @param pageNo
      * @param pageSize
      * @param req
@@ -255,4 +255,18 @@ public class ElderInfoController extends JeecgController<ElderInfo, IElderInfoSe
         elderInfoService.elderAudit(elderInfo);
         return Result.OK("编辑成功!");
     }
+
+    /**
+     * 长者信息变更护理人员
+     *
+     * @param elderInfo
+     * @return
+     */
+    @AutoLog(value = "长者信息变更-长者信息变更护理人员")
+    @ApiOperation(value = "长者信息变更-长者信息变更护理人员", notes = "长者信息变更-长者信息变更护理人员")
+    @RequestMapping(value = "/changeOrderly", method = {RequestMethod.POST})
+    public Result<String> changeOrderly(@RequestBody ElderInfo elderInfo) {
+        elderInfoService.changeOrderly(elderInfo);
+        return Result.OK("变更成功!");
+    }
 }

nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java

@@ -356,4 +356,10 @@ public class ElderInfo implements Serializable {
     @TableField(exist = false)
     private String auditContent;
 
+    /**
+     * 护理员nu_biz_employees_info.id
+     */
+    @Dict(dictTable = "nu_biz_employees_info",dicCode = "id",dicText = "name")
+    private java.lang.String orderly;
+
 }

nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/ElderInfoMapper.java

@@ -17,4 +17,6 @@ import java.util.List;
 public interface ElderInfoMapper extends BaseMapper<ElderInfo> {
 
     List<ElderServerEntity> getElderServerList(@Param("params") ElderInfoEntity elderInfoEntity);
+
+    void changeOrderly(ElderInfo elderInfo);
 }

nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml

@@ -1,15 +1,27 @@
 <?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.elderinfo.mapper.ElderInfoMapper">
+    <update id="changeOrderly">
+        update nu_biz_elder_info
+        set orderly =
+        <if test="orderly != null and orderly != ''">
+            #{orderly}
+        </if>
+        <if test="orderly == null or orderly == ''">
+            null
+        </if>
+        where id = #{id}
+    </update>
 
     <select id="getElderServerList" resultType="com.nu.entity.ElderServerEntity">
         select a.*,
-        b.preview_file,
-        b.preview_file_small,
-        b.immediate_file,
-        b.immediate_file_focus
+               b.preview_file,
+               b.preview_file_small,
+               b.immediate_file,
+               b.immediate_file_focus
         from nu_biz_nu_customer_server a
-        left join nu_config_service_directive b on a.directive_id = b.id
-        where a.nu_id = #{params.nuId} and a.customer_id = #{params.id}
+                 left join nu_config_service_directive b on a.directive_id = b.id
+        where a.nu_id = #{params.nuId}
+          and a.customer_id = #{params.id}
     </select>
 </mapper>

nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/IElderInfoService.java

@@ -23,4 +23,6 @@ public interface IElderInfoService extends IService<ElderInfo> {
     void guaAudit(ElderInfo elderInfo);
 
     void elderAudit(ElderInfo elderInfo);
+
+    void changeOrderly(ElderInfo elderInfo);
 }

nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java

@@ -251,6 +251,11 @@ public class ElderInfoServiceImpl extends ServiceImpl<ElderInfoMapper, ElderInfo
         }
     }
 
+    @Override
+    public void changeOrderly(ElderInfo elderInfo) {
+        baseMapper.changeOrderly(elderInfo);
+    }
+
     @Override
     public List<ElderInfoEntity> selectCurrentState3() {
         List<ElderInfo> elderInfos = baseMapper.selectList(new QueryWrapper<ElderInfo>().lambda().ne(ElderInfo::getCurrentState, "3"));

nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/entity/BizEmployeesInfo.java

@@ -237,4 +237,8 @@ public class BizEmployeesInfo implements Serializable {
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy.MM.dd")
 	@DateTimeFormat(pattern="yyyy.MM.dd")
 	private Date endTime;
+
+	/**接单上限*/
+	@ApiModelProperty(value = "接单上限")
+	private Integer orderCap;
 }