数据上报-逻辑删除-1客户基本信息、2合同信息、3家庭信息、4能力评估、5长护险信息、6入住退住信息。7员工基本信息、8从业经历、9处罚信息、10奖励信息、11资质信息、12补贴信息。13先进个人信息、14先进单位信息。

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/domain/ZwywBzglXjdwgl.java

@@ -112,4 +112,7 @@ public class ZwywBzglXjdwgl extends BaseEntity
     @TableField(exist = false)
     private String xzqhName;
 
+    @ApiModelProperty(value = "删除状态")
+    private Long state;
+
 }

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/domain/ZwywBzglXjgrgl.java

@@ -133,4 +133,7 @@ public class ZwywBzglXjgrgl extends BaseEntity
 
     private String xgcl;
 
+    @ApiModelProperty(value = "删除状态")
+    private Long state;
+
 }

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/ZwywBzglXjdwglServiceImpl.java

@@ -10,7 +10,6 @@ import com.ruoyi.system.utils.SubCodeUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -97,7 +96,14 @@ public class ZwywBzglXjdwglServiceImpl implements IZwywBzglXjdwglService
     @Override
     public int deleteZwywBzglXjdwglByIds(String[] ids)
     {
-        return zwywBzglXjdwglMapper.deleteBatchIds(Arrays.asList(ids));
+        for (int i = 0; i < ids.length; i++) {
+            ZwywBzglXjdwgl zwywBzglXjdwgl = new ZwywBzglXjdwgl();
+            zwywBzglXjdwgl.setId(ids[i]);
+            zwywBzglXjdwgl.setState(1L);
+            zwywBzglXjdwglMapper.updateById(zwywBzglXjdwgl);
+        }
+        return 1;
+//        return zwywBzglXjdwglMapper.deleteBatchIds(Arrays.asList(ids));
     }
 
 }

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/ZwywBzglXjgrglServiceImpl.java

@@ -10,7 +10,6 @@ import com.ruoyi.system.utils.SubCodeUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -97,7 +96,14 @@ public class ZwywBzglXjgrglServiceImpl implements IZwywBzglXjgrglService
     @Override
     public int deleteZwywBzglXjgrglByIds(String[] ids)
     {
-        return zwywBzglXjgrglMapper.deleteBatchIds(Arrays.asList(ids));
+        for (int i = 0; i < ids.length; i++) {
+            ZwywBzglXjgrgl zwywBzglXjgrgl = new ZwywBzglXjgrgl();
+            zwywBzglXjgrgl.setId(ids[i]);
+            zwywBzglXjgrgl.setState(1L);
+            zwywBzglXjgrglMapper.updateById(zwywBzglXjgrgl);
+        }
+        return 1;
+//        return zwywBzglXjgrglMapper.deleteBatchIds(Arrays.asList(ids));
     }
 
 }

ruoyi-modules/mz-business/src/main/resources/mapper/business/xjdwglMapper.xml

@@ -67,6 +67,7 @@ FROM
     <select id="selectZwywBzglXjdwglList" parameterType="ZwywBzglXjdwgl" resultMap="ZwywBzglXjdwglResult">
         <include refid="selectZwywBzglXjdwglVo"/>
         <where>
+            and state = '0'
             <if test="dwmc != null  and dwmc != ''"> and dwmc = #{dwmc}</if>
             <if test="dwlxr != null  and dwlxr != ''"> and dwlxr = #{dwlxr}</if>
             <if test="bzmc != null  and bzmc != ''"> and bzmc = #{bzmc}</if>
@@ -142,6 +143,7 @@ FROM
             <if test="bzdw != null">bzdw = #{bzdw},</if>
             <if test="xjsj != null and xjsj != ''">xjsj = #{xjsj},</if>
             <if test="xgcl != null">xgcl = #{xgcl},</if>
+            <if test="state != null">state = #{state},</if>
             update_time_str = #{updateTimeStr},
             update_user_id = #{updateUserId},
             update_by = #{updateBy},

ruoyi-modules/mz-business/src/main/resources/mapper/business/xjgrglMapper.xml

@@ -73,6 +73,7 @@ FROM
     <select id="selectZwywBzglXjgrglList" parameterType="ZwywBzglXjgrgl" resultMap="ZwywBzglXjgrglResult">
         <include refid="selectZwywBzglXjgrglVo"/>
         <where>
+            and state = '0'
             <if test="bbzrxm != null  and bbzrxm != ''"> and bbzrxm = #{bbzrxm}</if>
             <if test="tjdw != null  and tjdw != ''"> and tjdw = #{tjdw}</if>
             <if test="zjlx != null  and zjlx != ''"> and zjlx = #{zjlx}</if>
@@ -162,6 +163,7 @@ FROM
             <if test="bzdw != null">bzdw = #{bzdw},</if>
             <if test="xjsj != null and xjsj != ''">xjsj = #{xjsj},</if>
             <if test="xgcl != null">xgcl = #{xgcl},</if>
+            <if test="state != null">state = #{state},</if>
             update_time_str = #{updateTimeStr},
             update_user_id = #{updateUserId},
             update_by = #{updateBy},

ruoyi-modules/mz-organization-jg/src/main/java/com/ruoyi/organization/domain/YljgsqJcxx.java

@@ -195,10 +195,10 @@ public class YljgsqJcxx extends BaseEntity
     private String zdmj;
 
     /** 场所性质（CH032） */
-     @Excel(name = "场所性质", dictType = "CH032")
-    @ApiModelProperty(value = "场所性质（CH032）", required = true)
+     @Excel(name = "场所性质", dictType = "CH009")
+    @ApiModelProperty(value = "场所性质（CH009）", required = true)
     @NotBlank(message = "{场所性质}",groups = AddGroup.class)
-    @DictV(type = "CH032",message = "{场所性质}")
+    @DictV(type = "CH009",message = "{场所性质}")
     private String csxz;
 
     /** 是否享受社区养老服务税费减免（CZ035） */

ruoyi-modules/mz-organization-jg/src/main/java/com/ruoyi/organization/domain/YljgsqJcxxSt.java

@@ -176,10 +176,10 @@ public class YljgsqJcxxSt extends BaseEntity
     @Digits(integer = 10,fraction = 2,message = "{占地面积}")
     private String zdmj;
 
-    /** 场所性质（CH032） */
-    @ApiModelProperty(value = "场所性质（CH032）", required = true)
+    /** 场所性质（CH009） */
+    @ApiModelProperty(value = "场所性质（CH009）", required = true)
     @NotBlank(message = "{场所性质}",groups = AddGroup.class)
-    @DictV(type = "CH032",message = "{场所性质}")
+    @DictV(type = "CH009",message = "{场所性质}")
     private String csxz;
 
     /** 是否享受社区养老服务税费减免（CZ035） */

ruoyi-modules/mz-organization-khgl/src/main/java/com/ruoyi/organization/domain/YljgKhHtxx.java

@@ -262,4 +262,8 @@ public class YljgKhHtxx extends BaseEntity
     private String jgmc;
 
     private String status;
+
+    /** 数据上报新增字段-2024-12-5-CH */
+    /** ahdx0202-老人评估等级 */
+    private String ahdx0202;
 }

ruoyi-modules/mz-organization-khgl/src/main/java/com/ruoyi/organization/domain/YljgKhJbxx.java

@@ -354,4 +354,18 @@ public class YljgKhJbxx extends BaseEntity
 
     @TableField(exist = false)
     private String fxlb;
+
+
+    /** 数据上报新增字段-2024-12-5-CH*/
+    /** 实际入住时间 */
+    private String ahdx0103;
+    /** 实际退住时间 */
+    private String ahdx0104;
+    /** 老人评估等级 */
+    private String ahdx0202;
+
+    /** 长护险签约时间 */
+    private String ahdp2037;
+    /** 长护险报月销金额 */
+    private String ahdp2038;
 }

ruoyi-modules/mz-organization-khgl/src/main/java/com/ruoyi/organization/domain/YljgKhJtxx.java

@@ -111,4 +111,7 @@ public class YljgKhJtxx extends BaseEntity
     @EncryptionV
     private String jtcyjzd;
 
+    @ApiModelProperty(value = "删除状态")
+    private Long state;
+
 }

ruoyi-modules/mz-organization-khgl/src/main/java/com/ruoyi/organization/domain/YljgKhNlpg.java

@@ -108,4 +108,8 @@ public class YljgKhNlpg extends BaseEntity
     @EncryptionV
     private String lrrxm;
 
+
+    @ApiModelProperty(value = "删除状态")
+    private Long state;
+
 }

ruoyi-modules/mz-organization-khgl/src/main/java/com/ruoyi/organization/mapper/YljgKhChxxxMapper.java

@@ -1,5 +1,6 @@
 package com.ruoyi.organization.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.ruoyi.common.datascope.handler.DataColumn;
 import com.ruoyi.common.datascope.handler.DataPermission;
 import com.ruoyi.common.datascope.utils.BaseMapperPlus;
@@ -9,7 +10,7 @@ import java.util.List;
 
 /**
  * 养老机构_客户_长护险信息Mapper接口
- * 
+ *
  * @author sun
  * @date 2022-03-25
  */
@@ -23,7 +24,7 @@ public interface YljgKhChxxxMapper extends BaseMapperPlus<YljgKhChxxx>
 {
     /**
      * 查询养老机构_客户_长护险信息
-     * 
+     *
      * @param id 养老机构_客户_长护险信息主键
      * @return 养老机构_客户_长护险信息
      */
@@ -31,7 +32,7 @@ public interface YljgKhChxxxMapper extends BaseMapperPlus<YljgKhChxxx>
 
     /**
      * 查询养老机构_客户_长护险信息列表
-     * 
+     *
      * @param yljgKhChxxx 养老机构_客户_长护险信息
      * @return 养老机构_客户_长护险信息集合
      */
@@ -39,7 +40,7 @@ public interface YljgKhChxxxMapper extends BaseMapperPlus<YljgKhChxxx>
 
     /**
      * 新增养老机构_客户_长护险信息
-     * 
+     *
      * @param yljgKhChxxx 养老机构_客户_长护险信息
      * @return 结果
      */
@@ -47,7 +48,7 @@ public interface YljgKhChxxxMapper extends BaseMapperPlus<YljgKhChxxx>
 
     /**
      * 修改养老机构_客户_长护险信息
-     * 
+     *
      * @param yljgKhChxxx 养老机构_客户_长护险信息
      * @return 结果
      */
@@ -55,7 +56,7 @@ public interface YljgKhChxxxMapper extends BaseMapperPlus<YljgKhChxxx>
 
     /**
      * 删除养老机构_客户_长护险信息
-     * 
+     *
      * @param id 养老机构_客户_长护险信息主键
      * @return 结果
      */
@@ -63,9 +64,12 @@ public interface YljgKhChxxxMapper extends BaseMapperPlus<YljgKhChxxx>
 
     /**
      * 批量删除养老机构_客户_长护险信息
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteYljgKhChxxxByIds(String[] ids);
+    @InterceptorIgnore(tenantLine = "true")
+    public String selectLastChxxx(String khId);
+
 }

ruoyi-modules/mz-organization-khgl/src/main/java/com/ruoyi/organization/mapper/YljgKhHtxxMapper.java

@@ -5,6 +5,9 @@ import com.ruoyi.common.datascope.handler.DataPermission;
 import com.ruoyi.common.datascope.utils.BaseMapperPlus;
 import com.ruoyi.common.datasource.annotation.Slave;
 import com.ruoyi.organization.domain.YljgKhHtxx;
+import com.ruoyi.organization.domain.YljgKhJbxx;
+import com.ruoyi.organization.domain.YljgKhJtxx;
+import com.ruoyi.organization.domain.YljgKhNlpg;
 
 import java.util.List;
 
@@ -95,4 +98,9 @@ public interface YljgKhHtxxMapper extends BaseMapperPlus<YljgKhHtxx>
      */
     @Slave
     public long selectBusinessYljgKhHtxxByQyCount(YljgKhHtxx yljgKhHtxx);
+
+    public int updateYljgKhJbxxBySjsb(YljgKhJbxx yljgKhJbxx);
+    public int updateYljgKhHtxxBySjsb(YljgKhHtxx yljgKhHtxx);
+    public int updateYljgKhNlpgBySjsb(YljgKhNlpg yljgKhNlpg);
+    public int updateYljgKhJtxxBySjsb(YljgKhJtxx yljgKhJtxx);
 }

ruoyi-modules/mz-organization-khgl/src/main/java/com/ruoyi/organization/mapper/YljgKhNlpgMapper.java

@@ -1,5 +1,6 @@
 package com.ruoyi.organization.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.ruoyi.common.datascope.handler.DataColumn;
 import com.ruoyi.common.datascope.handler.DataPermission;
 import com.ruoyi.common.datascope.utils.BaseMapperPlus;
@@ -68,4 +69,7 @@ public interface YljgKhNlpgMapper extends BaseMapperPlus<YljgKhNlpg>
     public int deleteYljgKhNlpgByIds(String[] ids);
 
     public List<YljgKhNlpg> checkYljgKhNlpg(YljgKhNlpg yljgKhNlpg);
+
+    @InterceptorIgnore(tenantLine = "true")
+    public String selectLastNlpg(String khId);
 }

ruoyi-modules/mz-organization-khgl/src/main/java/com/ruoyi/organization/service/IYljgKhChxxxService.java

@@ -54,11 +54,11 @@ public interface IYljgKhChxxxService
      */
     public int deleteYljgKhChxxxByIds(String[] ids);
 
-    /**
-     * 删除养老机构_客户_长护险信息信息
-     *
-     * @param id 养老机构_客户_长护险信息主键
-     * @return 结果
-     */
-    public int deleteYljgKhChxxxById(String id);
+//    /**
+//     * 删除养老机构_客户_长护险信息信息
+//     *
+//     * @param id 养老机构_客户_长护险信息主键
+//     * @return 结果
+//     */
+//    public int deleteYljgKhChxxxById(String id);
 }

ruoyi-modules/mz-organization-khgl/src/main/java/com/ruoyi/organization/service/IYljgKhHtxxService.java

@@ -67,7 +67,7 @@ public interface IYljgKhHtxxService
      * @param id 养老机构_客户_合同信息主键
      * @return 结果
      */
-    public int deleteYljgKhHtxxById(String id);
+//    public int deleteYljgKhHtxxById(String id);
 
     /**
      *  检测是否可以对房间管理项目进行删除处理

ruoyi-modules/mz-organization-khgl/src/main/java/com/ruoyi/organization/service/IYljgKhJbxxService.java

@@ -71,7 +71,7 @@ public interface IYljgKhJbxxService
      * @param id 养老机构_客户_基本信息主键
      * @return 结果
      */
-    public int deleteYljgKhJbxxById(String id);
+//    public int deleteYljgKhJbxxById(String id);
 
     /**
      * BUSINESS用

ruoyi-modules/mz-organization-khgl/src/main/java/com/ruoyi/organization/service/IYljgKhJtxxService.java

@@ -6,15 +6,15 @@ import java.util.List;
 
 /**
  * 养老机构_客户_家庭信息Service接口
- * 
+ *
  * @author sun
  * @date 2022-03-25
  */
-public interface IYljgKhJtxxService 
+public interface IYljgKhJtxxService
 {
     /**
      * 查询养老机构_客户_家庭信息
-     * 
+     *
      * @param id 养老机构_客户_家庭信息主键
      * @return 养老机构_客户_家庭信息
      */
@@ -22,7 +22,7 @@ public interface IYljgKhJtxxService
 
     /**
      * 查询养老机构_客户_家庭信息列表
-     * 
+     *
      * @param yljgKhJtxx 养老机构_客户_家庭信息
      * @return 养老机构_客户_家庭信息集合
      */
@@ -30,7 +30,7 @@ public interface IYljgKhJtxxService
 
     /**
      * 新增养老机构_客户_家庭信息
-     * 
+     *
      * @param yljgKhJtxx 养老机构_客户_家庭信息
      * @return 结果
      */
@@ -38,7 +38,7 @@ public interface IYljgKhJtxxService
 
     /**
      * 修改养老机构_客户_家庭信息
-     * 
+     *
      * @param yljgKhJtxx 养老机构_客户_家庭信息
      * @return 结果
      */
@@ -46,17 +46,10 @@ public interface IYljgKhJtxxService
 
     /**
      * 批量删除养老机构_客户_家庭信息
-     * 
+     *
      * @param ids 需要删除的养老机构_客户_家庭信息主键集合
      * @return 结果
      */
     public int deleteYljgKhJtxxByIds(String[] ids);
 
-    /**
-     * 删除养老机构_客户_家庭信息信息
-     * 
-     * @param id 养老机构_客户_家庭信息主键
-     * @return 结果
-     */
-    public int deleteYljgKhJtxxById(String id);
 }

ruoyi-modules/mz-organization-khgl/src/main/java/com/ruoyi/organization/service/impl/YljgKhChxxxServiceImpl.java

@@ -1,14 +1,24 @@
 package com.ruoyi.organization.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.organization.domain.YljgKhChxxx;
+import com.ruoyi.organization.domain.YljgKhJbxx;
 import com.ruoyi.organization.mapper.YljgKhChxxxMapper;
+import com.ruoyi.organization.mapper.YljgKhHtxxMapper;
 import com.ruoyi.organization.service.IYljgKhChxxxService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 养老机构_客户_长护险信息Service业务层处理
@@ -22,6 +32,9 @@ public class YljgKhChxxxServiceImpl implements IYljgKhChxxxService
     @Autowired
     private YljgKhChxxxMapper yljgKhChxxxMapper;
 
+    @Autowired
+    private YljgKhHtxxMapper yljgKhHtxxMapper;
+
     /**
      * 查询养老机构_客户_长护险信息
      *
@@ -57,7 +70,17 @@ public class YljgKhChxxxServiceImpl implements IYljgKhChxxxService
     {
         yljgKhChxxx.setId(IdUtils.simpleUUID());
         yljgKhChxxx.setJgId(SecurityUtils.getJgId());
-        return yljgKhChxxxMapper.insertYljgKhChxxx(yljgKhChxxx);
+        int r = yljgKhChxxxMapper.insertYljgKhChxxx(yljgKhChxxx);
+        if("1".equals(yljgKhChxxx.getIsYx())){
+            YljgKhJbxx yljgKhJbxx = new YljgKhJbxx();
+            yljgKhJbxx.setId(yljgKhChxxx.getKhId());
+            yljgKhJbxx.setIsChx("1");
+            yljgKhJbxx.setAhdp2037(yljgKhChxxx.getQysj());
+            yljgKhJbxx.setAhdp2038(yljgKhChxxx.getBxzj());
+            yljgKhHtxxMapper.updateYljgKhJbxxBySjsb(yljgKhJbxx);
+        }
+
+        return r;
     }
 
     /**
@@ -69,6 +92,27 @@ public class YljgKhChxxxServiceImpl implements IYljgKhChxxxService
     @Override
     public int updateYljgKhChxxx(YljgKhChxxx yljgKhChxxx)
     {
+
+        YljgKhChxxx orgChxxx = yljgKhChxxxMapper.selectById(yljgKhChxxx.getId());
+        BeanUtil.copyProperties(yljgKhChxxx,orgChxxx,new CopyOptions().ignoreNullValue());
+
+        String lastId = yljgKhChxxxMapper.selectLastChxxx(orgChxxx.getKhId());
+
+        YljgKhJbxx yljgKhJbxx = new YljgKhJbxx();
+        yljgKhJbxx.setId(orgChxxx.getKhId());
+
+        if(StringUtils.equals(lastId,yljgKhChxxx.getId())){
+            if("0".equals(yljgKhChxxx.getIsYx())){
+                yljgKhJbxx.setIsChx("0");
+                yljgKhJbxx.setAhdp2037("empty");
+                yljgKhJbxx.setAhdp2038("empty");
+            } else{
+                yljgKhJbxx.setIsChx("1");
+                yljgKhJbxx.setAhdp2037(yljgKhChxxx.getQysj());
+                yljgKhJbxx.setAhdp2038(yljgKhChxxx.getBxzj());
+            }
+            yljgKhHtxxMapper.updateYljgKhJbxxBySjsb(yljgKhJbxx);
+        }
         return yljgKhChxxxMapper.updateYljgKhChxxx(yljgKhChxxx);
     }
 
@@ -81,18 +125,45 @@ public class YljgKhChxxxServiceImpl implements IYljgKhChxxxService
     @Override
     public int deleteYljgKhChxxxByIds(String[] ids)
     {
+        YljgKhChxxx orgChxxx = yljgKhChxxxMapper.selectById(ids[0]);
+
+        LambdaQueryWrapper<YljgKhChxxx> lqw = new LambdaQueryWrapper<YljgKhChxxx>()
+                .eq(YljgKhChxxx::getKhId, orgChxxx.getKhId())
+                .eq(YljgKhChxxx::getIsYx, "1");
+        List<YljgKhChxxx> chxList = yljgKhChxxxMapper.selectList(lqw);
+        YljgKhJbxx yljgKhJbxx = new YljgKhJbxx();
+        yljgKhJbxx.setId(orgChxxx.getKhId());
+        if(chxList.size()<2){
+            yljgKhJbxx.setIsChx("0");
+            yljgKhJbxx.setAhdp2037("empty");
+            yljgKhJbxx.setAhdp2038("empty");
+        }else{
+//            chxList.stream().sorted(Comparator.comparing(YljgKhChxxx::getQysj).reversed()).collect(Collectors.toList());
+
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+            List<YljgKhChxxx> sortedList = chxList.stream()
+                    .sorted(Comparator.comparing(
+                            (YljgKhChxxx yljgKhChxxx) -> LocalDate.parse(yljgKhChxxx.getQysj(), formatter)
+                    ).reversed()) // 倒序排列
+                    .collect(Collectors.toList());
+            YljgKhChxxx chxxx = sortedList.get(1);
+            yljgKhJbxx.setIsChx("1");
+            yljgKhJbxx.setAhdp2037(chxxx.getQysj());
+            yljgKhJbxx.setAhdp2038(chxxx.getBxzj());
+        }
+        yljgKhHtxxMapper.updateYljgKhJbxxBySjsb(yljgKhJbxx);
         return yljgKhChxxxMapper.deleteYljgKhChxxxByIds(ids);
     }
 
-    /**
-     * 删除养老机构_客户_长护险信息信息
-     *
-     * @param id 养老机构_客户_长护险信息主键
-     * @return 结果
-     */
-    @Override
-    public int deleteYljgKhChxxxById(String id)
-    {
-        return yljgKhChxxxMapper.deleteYljgKhChxxxById(id);
-    }
+//    /**
+//     * 删除养老机构_客户_长护险信息信息
+//     *
+//     * @param id 养老机构_客户_长护险信息主键
+//     * @return 结果
+//     */
+//    @Override
+//    public int deleteYljgKhChxxxById(String id)
+//    {
+//        return yljgKhChxxxMapper.deleteYljgKhChxxxById(id);
+//    }
 }

ruoyi-modules/mz-organization-khgl/src/main/java/com/ruoyi/organization/service/impl/YljgKhHtxxServiceImpl.java

@@ -187,7 +187,14 @@ public class YljgKhHtxxServiceImpl implements IYljgKhHtxxService
         for (String htId: htIdList) {
             terminateContract(htId);
         }
-        return yljgKhHtxxMapper.deleteYljgKhHtxxByIds(ids);
+        for (int i = 0; i < ids.length; i++) {
+            YljgKhHtxx yljgKhHtxx = new YljgKhHtxx();
+            yljgKhHtxx.setId(ids[i]);
+            yljgKhHtxx.setStatus("99");
+            yljgKhHtxxMapper.updateById(yljgKhHtxx);
+        }
+        return 1;
+//        return yljgKhHtxxMapper.deleteYljgKhHtxxByIds(ids);
     }
 
     public void terminateContract(String htId) {
@@ -219,11 +226,15 @@ public class YljgKhHtxxServiceImpl implements IYljgKhHtxxService
      * @param id 养老机构_客户_合同信息主键
      * @return 结果
      */
-    @Override
-    public int deleteYljgKhHtxxById(String id)
-    {
-        return yljgKhHtxxMapper.deleteYljgKhHtxxById(id);
-    }
+//    @Override
+//    public int deleteYljgKhHtxxById(String id)
+//    {
+//        YljgKhHtxx yljgKhHtxx = new YljgKhHtxx();
+//        yljgKhHtxx.setId(id);
+//        yljgKhHtxx.setStatus("99");
+//        return yljgKhHtxxMapper.updateById(yljgKhHtxx);
+////        return yljgKhHtxxMapper.deleteYljgKhHtxxById(id);
+//    }
 
     /**
      *  检测是否可以对房间管理项目进行删除处理

ruoyi-modules/mz-organization-khgl/src/main/java/com/ruoyi/organization/service/impl/YljgKhJbxxServiceImpl.java

@@ -13,9 +13,7 @@ import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.organization.domain.*;
-import com.ruoyi.organization.mapper.YljgKhHtxxMapper;
-import com.ruoyi.organization.mapper.YljgKhJbxxMapper;
-import com.ruoyi.organization.mapper.YljgKhRztzxxMapper;
+import com.ruoyi.organization.mapper.*;
 import com.ruoyi.organization.service.IYljgKhJbxxService;
 import com.ruoyi.system.api.RemoteDictDataService;
 import com.ruoyi.system.api.domain.SysDictData;
@@ -191,13 +189,23 @@ public class YljgKhJbxxServiceImpl implements IYljgKhJbxxService
             yljgKhJbxx.setId(id);
             yljgKhJbxx.setStatus(DataStatus.DELETE.getCode());
             res += updateYljgKhJbxx(yljgKhJbxx);
-            yljgKhJbxxMapper.deleteYljgKhJtxxByKhId(id);
+
+            YljgKhJtxx yljgKhJtxx = new YljgKhJtxx();
+            yljgKhJtxx.setKhId(id);
+            yljgKhJtxx.setState(1L);
+            yljgKhHtxxMapper.updateYljgKhJtxxBySjsb(yljgKhJtxx);
+
             yljgKhJbxxMapper.deleteYljgKhChxxxByKhId(id);
             yljgKhJbxxMapper.deleteYljgKhBsxxByKhId(id);
             yljgKhJbxxMapper.deleteYljgKhGmxxByKhId(id);
             yljgKhJbxxMapper.deleteYljgKhRcyyByKhId(id);
             yljgKhJbxxMapper.deleteYljgKhTzxxByKhId(id);
-            yljgKhJbxxMapper.deleteYljgKhNlpgByKhId(id);
+
+            YljgKhNlpg yljgKhNlpg = new YljgKhNlpg();
+            yljgKhNlpg.setKhId(id);
+            yljgKhNlpg.setState(1L);
+            yljgKhHtxxMapper.updateYljgKhNlpgBySjsb(yljgKhNlpg);
+
             yljgKhJbxxMapper.deleteYljgKhHlgdByKhId(id);
             yljgKhJbxxMapper.deleteYljgKhHfdjByKhId(id);
             yljgKhJbxxMapper.deleteYljgKhFwxmByKhId(id);
@@ -206,26 +214,40 @@ public class YljgKhJbxxServiceImpl implements IYljgKhJbxxService
             YljgKhHtxx htxx = yljgKhHtxxMapper.selectYljgKhHtxxList(htxxQuery).stream().findFirst().orElse(null);
             if (ObjectUtils.isNotEmpty(htxx)) {
                 yljgKhHtxxServiceImpl.terminateContract(htxx.getId());
-                yljgKhHtxxMapper.deleteYljgKhHtxxById(htxx.getId());
+                YljgKhHtxx yljgKhHtxx = new YljgKhHtxx();
+                yljgKhHtxx.setKhId(id);
+                yljgKhHtxx.setStatus("99");
+                yljgKhHtxxMapper.updateYljgKhHtxxBySjsb(yljgKhHtxx);
+//                yljgKhHtxxMapper.deleteYljgKhHtxxById(htxx.getId());
             }
         }
         return res;
     }
 
-    /**
-     * 删除养老机构_客户_基本信息信息
-     *
-     * @param id 养老机构_客户_基本信息主键
-     * @return 结果
-     */
-    @Transactional
-    @Override
-    public int deleteYljgKhJbxxById(String id)
-    {
-        yljgKhJbxxMapper.deleteYljgKhJtxxByKhId(id);
-        yljgKhJbxxMapper.deleteYljgKhChxxxByKhId(id);
-        return yljgKhJbxxMapper.deleteYljgKhJbxxById(id);
-    }
+//    /**
+//     * 删除养老机构_客户_基本信息信息
+//     *
+//     * @param id 养老机构_客户_基本信息主键
+//     * @return 结果
+//     */
+//    @Transactional
+//    @Override
+//    public int deleteYljgKhJbxxById(String id)
+//    {
+//        YljgKhJtxx yljgKhJtxx = new YljgKhJtxx();
+//        yljgKhJtxx.setKhId(id);
+//        yljgKhJtxx.setState(1L);
+//        yljgKhJtxxMapper.updateById(yljgKhJtxx);
+//
+////        yljgKhJbxxMapper.deleteYljgKhJtxxByKhId(id);
+//        yljgKhJbxxMapper.deleteYljgKhChxxxByKhId(id);
+//
+//        YljgKhJbxx yljgKhJbxx = new YljgKhJbxx();
+//        yljgKhJbxx.setId(id);
+//        yljgKhJbxx.setStatus("99");
+//        return yljgKhJbxxMapper.updateById(yljgKhJbxx);
+////        return yljgKhJbxxMapper.deleteYljgKhJbxxById(id);
+//    }
 
     /**
      * BUSINESS用

ruoyi-modules/mz-organization-khgl/src/main/java/com/ruoyi/organization/service/impl/YljgKhJtxxServiceImpl.java

@@ -57,6 +57,7 @@ public class YljgKhJtxxServiceImpl implements IYljgKhJtxxService
     {
         yljgKhJtxx.setId(IdUtils.simpleUUID());
         yljgKhJtxx.setJgId(SecurityUtils.getJgId());
+        yljgKhJtxx.setState(0L);
         return yljgKhJtxxMapper.insertYljgKhJtxx(yljgKhJtxx);
     }
 
@@ -81,18 +82,14 @@ public class YljgKhJtxxServiceImpl implements IYljgKhJtxxService
     @Override
     public int deleteYljgKhJtxxByIds(String[] ids)
     {
-        return yljgKhJtxxMapper.deleteYljgKhJtxxByIds(ids);
+        for (int i = 0; i < ids.length; i++) {
+            YljgKhJtxx yljgKhJtxx = new YljgKhJtxx();
+            yljgKhJtxx.setId(ids[i]);
+            yljgKhJtxx.setState(1L);
+            yljgKhJtxxMapper.updateById(yljgKhJtxx);
+        }
+        return 1;
+//        return yljgKhJtxxMapper.deleteYljgKhJtxxByIds(ids);
     }
 
-    /**
-     * 删除养老机构_客户_家庭信息信息
-     *
-     * @param id 养老机构_客户_家庭信息主键
-     * @return 结果
-     */
-    @Override
-    public int deleteYljgKhJtxxById(String id)
-    {
-        return yljgKhJtxxMapper.deleteYljgKhJtxxById(id);
-    }
 }

ruoyi-modules/mz-organization-khgl/src/main/java/com/ruoyi/organization/service/impl/YljgKhNlpgServiceImpl.java

@@ -1,8 +1,14 @@
 package com.ruoyi.organization.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.organization.domain.YljgKhHtxx;
+import com.ruoyi.organization.domain.YljgKhJbxx;
 import com.ruoyi.organization.domain.YljgKhNlpg;
+import com.ruoyi.organization.mapper.YljgKhHtxxMapper;
 import com.ruoyi.organization.mapper.YljgKhNlpgMapper;
 import com.ruoyi.organization.service.IYljgKhNlpgService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,19 +18,22 @@ import java.util.List;
 
 /**
  * 老人能力评估Service业务层处理
- * 
+ *
  * @author sun
  * @date 2022-04-03
  */
 @Service
-public class YljgKhNlpgServiceImpl implements IYljgKhNlpgService 
+public class YljgKhNlpgServiceImpl implements IYljgKhNlpgService
 {
     @Autowired
     private YljgKhNlpgMapper yljgKhNlpgMapper;
 
+    @Autowired
+    private YljgKhHtxxMapper yljgKhHtxxMapper;
+
     /**
      * 查询老人能力评估
-     * 
+     *
      * @param id 老人能力评估主键
      * @return 老人能力评估
      */
@@ -36,7 +45,7 @@ public class YljgKhNlpgServiceImpl implements IYljgKhNlpgService
 
     /**
      * 查询老人能力评估列表
-     * 
+     *
      * @param yljgKhNlpg 老人能力评估
      * @return 老人能力评估
      */
@@ -48,7 +57,7 @@ public class YljgKhNlpgServiceImpl implements IYljgKhNlpgService
 
     /**
      * 新增老人能力评估
-     * 
+     *
      * @param yljgKhNlpg 老人能力评估
      * @return 结果
      */
@@ -57,36 +66,82 @@ public class YljgKhNlpgServiceImpl implements IYljgKhNlpgService
     {
         yljgKhNlpg.setId(IdUtils.simpleUUID());
         yljgKhNlpg.setJgId(SecurityUtils.getJgId());
-        return yljgKhNlpgMapper.insertYljgKhNlpg(yljgKhNlpg);
+        int rt = yljgKhNlpgMapper.insertYljgKhNlpg(yljgKhNlpg);
+
+        updateKhxxHtxxPackage(yljgKhNlpg);
+
+        return rt;
     }
 
     /**
      * 修改老人能力评估
-     * 
+     *
      * @param yljgKhNlpg 老人能力评估
      * @return 结果
      */
     @Override
     public int updateYljgKhNlpg(YljgKhNlpg yljgKhNlpg)
     {
-        return yljgKhNlpgMapper.updateYljgKhNlpg(yljgKhNlpg);
+        YljgKhNlpg origin = yljgKhNlpgMapper.selectById(yljgKhNlpg.getId());
+        BeanUtil.copyProperties(yljgKhNlpg,origin,new CopyOptions().ignoreNullValue());
+
+        String lastId = yljgKhNlpgMapper.selectLastNlpg(yljgKhNlpg.getKhId());
+
+        if(StringUtils.isNotBlank(yljgKhNlpg.getPgdj()) && StringUtils.equals(lastId,yljgKhNlpg.getId())){
+            updateKhxxHtxxPackage(yljgKhNlpg);
+        }
+
+        int rt = yljgKhNlpgMapper.updateYljgKhNlpg(yljgKhNlpg);
+
+        return rt;
+    }
+
+    private void updateKhxxHtxxPackage(YljgKhNlpg yljgKhNlpg) {
+        YljgKhJbxx yljgKhJbxx = new YljgKhJbxx();
+        yljgKhJbxx.setId(yljgKhNlpg.getKhId());
+        yljgKhJbxx.setAhdx0202(yljgKhNlpg.getPgdj());
+        yljgKhHtxxMapper.updateYljgKhJbxxBySjsb(yljgKhJbxx);
+
+        YljgKhHtxx yljgKhHtxx = new YljgKhHtxx();
+        yljgKhHtxx.setKhId(yljgKhNlpg.getKhId());
+        yljgKhHtxx.setAhdx0202(yljgKhNlpg.getPgdj());
+        yljgKhHtxxMapper.updateYljgKhHtxxBySjsb(yljgKhHtxx);
     }
 
     /**
      * 批量删除老人能力评估
-     * 
+     *
      * @param ids 需要删除的老人能力评估主键
      * @return 结果
      */
     @Override
     public int deleteYljgKhNlpgByIds(String[] ids)
     {
-        return yljgKhNlpgMapper.deleteYljgKhNlpgByIds(ids);
+        for (int i = 0; i < ids.length; i++) {
+            YljgKhNlpg origin = yljgKhNlpgMapper.selectById(ids[i]);
+            String lastId = yljgKhNlpgMapper.selectLastNlpg(origin.getKhId());
+            if(StringUtils.equals(lastId,ids[i])){
+                YljgKhJbxx yljgKhJbxx = new YljgKhJbxx();
+                yljgKhJbxx.setId(origin.getKhId());
+                yljgKhJbxx.setAhdx0202("99");
+                yljgKhHtxxMapper.updateYljgKhJbxxBySjsb(yljgKhJbxx);
+
+                YljgKhHtxx yljgKhHtxx = new YljgKhHtxx();
+                yljgKhHtxx.setKhId(origin.getKhId());
+                yljgKhHtxx.setAhdx0202("99");
+                yljgKhHtxxMapper.updateYljgKhHtxxBySjsb(yljgKhHtxx);
+            }
+            YljgKhNlpg yljgKhNlpg = new YljgKhNlpg();
+            yljgKhNlpg.setId(ids[i]);
+            yljgKhNlpg.setState(1L);
+            yljgKhNlpgMapper.updateById(yljgKhNlpg);
+        }
+        return 1;
     }
 
     /**
      * 删除老人能力评估信息
-     * 
+     *
      * @param id 老人能力评估主键
      * @return 结果
      */

ruoyi-modules/mz-organization-khgl/src/main/java/com/ruoyi/organization/service/impl/YljgKhRztzxxServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.organization.service.impl;
 
+import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
@@ -165,6 +166,7 @@ public class YljgKhRztzxxServiceImpl implements IYljgKhRztzxxService {
             YljgKhJbxx jbxx = new YljgKhJbxx();
             jbxx.setId(yljgKhRztzxx.getKhId());
             jbxx.setIsRz(CheckInStatus.YES.getCode());
+            jbxx.setAhdx0103(yljgKhRztzxx.getSjrzsj());
             yljgKhJbxxMapper.updateYljgKhJbxx(jbxx);
             YljgKhHtxx yljgKhHtxx = yljgKhHtxxMapper.selectYljgKhHtxxById(yljgKhRztzxx.getHtId());
             YljgKhHtxx htxx = new YljgKhHtxx();
@@ -193,9 +195,13 @@ public class YljgKhRztzxxServiceImpl implements IYljgKhRztzxxService {
         if (StringUtils.equals(yljgKhRztzxx.getIsSh(), ExamineStatus.YES.getCode())) {
             yljgKhRztzxx.setRzzt(ContractStatus.DISCHARGE.getCode());
             YljgKhJbxx yljgKhJbxx = yljgKhJbxxMapper.selectYljgKhJbxxById(yljgKhRztzxx.getKhId());
+            if(StringUtils.isNull(yljgKhJbxx)){
+                throw new ServiceException("该客户基本信息已不存在，请联系管理员删除");
+            }
             YljgKhJbxx jbxx = new YljgKhJbxx();
             jbxx.setId(yljgKhJbxx.getId());
             jbxx.setIsRz(CheckInStatus.NO.getCode());
+            jbxx.setAhdx0104(StringUtils.isBlank(yljgKhRztzxx.getSjtzrq())?yljgKhRztzxx.getTzsqrq():yljgKhRztzxx.getSjtzrq());
             yljgKhJbxxMapper.updateYljgKhJbxx(jbxx);
             YljgKhHtxx htQuery = new YljgKhHtxx();
             htQuery.setKhId(yljgKhRztzxx.getKhId());

ruoyi-modules/mz-organization-khgl/src/main/resources/mapper/organization/YljgKhChxxxMapper.xml

@@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bxzj != null "> and bxzj = #{bxzj}</if>
             <if test="isYx != null "> and is_yx = #{isYx}</if>
         </where>
+        order by qysj desc
     </select>
 
     <select id="selectYljgKhChxxxById" parameterType="String" resultMap="YljgKhChxxxResult">
@@ -121,4 +122,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectLastChxxx" parameterType="YljgKhChxxx" resultType="String">
+        select id
+        from yljg_kh_chxxx
+        where kh_id = #{khId}
+        order by create_time_str desc limit 1
+    </select>
+
+
+
 </mapper>

ruoyi-modules/mz-organization-khgl/src/main/resources/mapper/organization/YljgKhHtxxMapper.xml

@@ -55,15 +55,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isQy"    column="is_qy"    />
         <result property="isRz"    column="is_rz"    />
         <result property="age"    column="age"    />
+        <result property="ahdx0202"    column="ahdx0202"    />
     </resultMap>
 
     <sql id="selectYljgKhHtxxVo">
-        select id, xm, zjhm, xb, cwh, ly, lc, fjh, hldj, fylx, cwf, cwfyj, cyf, cyfyj, hlf, hlfyj, htksrq, htjsrq, yjrzrq, sjrzsj, htqdrq, htxlh, htfj, jg_id, rzzt, kh_id, create_time_str, create_user_id, create_by, create_unit,create_tounit,create_bmjsc,create_qhjsc, create_unit_name, update_time_str, update_user_id, update_by, update_unit, update_unit_name, ly_id, lc_id, fj_id, cw_id from yljg_kh_htxx
+        select id, xm, zjhm, xb, cwh, ly, lc, fjh, hldj, fylx, cwf, cwfyj, cyf, cyfyj, hlf, hlfyj, htksrq, htjsrq, yjrzrq, sjrzsj, htqdrq, htxlh, htfj, jg_id, rzzt, kh_id, ahdx0202, create_time_str, create_user_id, create_by, create_unit,create_tounit,create_bmjsc,create_qhjsc, create_unit_name, update_time_str, update_user_id, update_by, update_unit, update_unit_name, ly_id, lc_id, fj_id, cw_id from yljg_kh_htxx
     </sql>
 
     <select id="selectYljgKhHtxxList" parameterType="YljgKhHtxx" resultMap="YljgKhHtxxResult">
         <include refid="selectYljgKhHtxxVo"/>
         <where>
+            AND status != '99'
             <if test="jgId != null and jgId != ''"> and jg_id = #{jgId}</if>
             <if test="khId != null and khId != ''"> and kh_id = #{khId}</if>
             <if test="xm != null  and xm != ''"> and xm = #{xm}</if>
@@ -249,6 +251,71 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateYljgKhJbxxBySjsb" parameterType="YljgKhJbxx">
+        update yljg_kh_jbxx
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="ahdx0103 != null and ahdx0103 != ''">ahdx0103 = #{ahdx0103},</if>
+            <if test="ahdx0104 != null and ahdx0104 != ''">ahdx0104 = #{ahdx0104},</if>
+            <if test="ahdx0103 != null and ahdx0103 == 'empty'">ahdx0103 = '',</if>
+            <if test="ahdx0104 != null and ahdx0104 == 'empty'">ahdx0104 = '',</if>
+            <if test="isChx != null and isChx != ''">is_chx = #{isChx},</if>
+            <if test="ahdp2037 != null and ahdp2037 != ''">ahdp2037 = #{ahdp2037},</if>
+            <if test="ahdp2038 != null and ahdp2038 != ''">ahdp2038 = #{ahdp2038},</if>
+            <if test="ahdp2037 != null and ahdp2037 == 'empty'">ahdp2037 = '',</if>
+            <if test="ahdp2038 != null and ahdp2038 == 'empty'">ahdp2038 = '',</if>
+            <if test="ahdx0202 != null and ahdx0202 != ''">ahdx0202 = #{ahdx0202},</if>
+            <if test="isRz != null and isRz != ''">is_rz = #{isRz},</if>
+            <if test="isQy != null and isQy != ''">is_qy = #{isQy},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            update_time_str = #{updateTimeStr},
+            update_user_id = #{updateUserId},
+            update_by = #{updateBy},
+            update_unit = #{updateUnit},
+            update_unit_name = #{updateUnitName},
+        </trim>
+        where id = #{id} AND status = '0'
+    </update>
+
+    <update id="updateYljgKhHtxxBySjsb" parameterType="YljgKhHtxx">
+        update yljg_kh_htxx
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="ahdx0202 != null and ahdx0202 != ''">ahdx0202 = #{ahdx0202},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            update_time_str = #{updateTimeStr},
+            update_user_id = #{updateUserId},
+            update_by = #{updateBy},
+            update_unit = #{updateUnit},
+            update_unit_name = #{updateUnitName},
+        </trim>
+        where kh_id = #{khId} AND status = '0'
+    </update>
+
+    <update id="updateYljgKhNlpgBySjsb" parameterType="YljgKhNlpg">
+        update yljg_kh_nlpg
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="state != null and state != ''">state = #{state},</if>
+            update_time_str = #{updateTimeStr},
+            update_user_id = #{updateUserId},
+            update_by = #{updateBy},
+            update_unit = #{updateUnit},
+            update_unit_name = #{updateUnitName},
+        </trim>
+        where kh_id = #{khId} AND state = '0'
+    </update>
+
+    <update id="updateYljgKhJtxxBySjsb" parameterType="YljgKhJtxx">
+        update yljg_kh_jtxx
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="state != null and state != ''">state = #{state},</if>
+            update_time_str = #{updateTimeStr},
+            update_user_id = #{updateUserId},
+            update_by = #{updateBy},
+            update_unit = #{updateUnit},
+            update_unit_name = #{updateUnitName},
+        </trim>
+        where kh_id = #{khId} AND state = '0'
+    </update>
+
     <delete id="deleteYljgKhHtxxById" parameterType="String">
         delete from yljg_kh_htxx where id = #{id}
     </delete>

ruoyi-modules/mz-organization-khgl/src/main/resources/mapper/organization/YljgKhJbxxMapper.xml

@@ -462,6 +462,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isQy != null">is_qy = #{isQy},</if>
             <if test="isRz != null">is_rz = #{isRz},</if>
             <if test="status != null and status != ''">status = #{status},</if>
+            <if test="ahdx0103 != null and ahdx0103 != ''">ahdx0103 = #{ahdx0103},</if>
+            <if test="ahdx0104 != null and ahdx0104 != ''">ahdx0104 = #{ahdx0104},</if>
             update_time_str = #{updateTimeStr},
             update_user_id = #{updateUserId},
             update_by = #{updateBy},

ruoyi-modules/mz-organization-khgl/src/main/resources/mapper/organization/YljgKhJtxxMapper.xml

@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectYljgKhJtxxList" parameterType="YljgKhJtxx" resultMap="YljgKhJtxxResult">
         <include refid="selectYljgKhJtxxVo"/>
         <where>
+            AND state = '0'
             <if test="khId != null and khId != ''"> and kh_id = #{khId}</if>
             <if test="jtcyxm != null  and jtcyxm != ''"> and jtcyxm = #{jtcyxm}</if>
             <if test="jtcyzjlx != null  and jtcyzjlx != ''"> and jtcyzjlx = #{jtcyzjlx}</if>
@@ -56,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="checkYljgKhJtxx" parameterType="YljgKhJtxx" resultMap="YljgKhJtxxResult">
         <include refid="selectYljgKhJtxxVo"/>
         <where>
+            AND state = '0'
             <if test="id != null and id != ''"> and id != #{id}</if>
             <if test="khId != null and khId != ''"> and kh_id = #{khId}</if>
             <if test="jtcyzjlx != null  and jtcyzjlx != ''"> and jtcyzjlx = #{jtcyzjlx}</if>
@@ -117,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{createUnitName}
          </trim>
         WHERE NOT EXISTS
-        (select jtcyzjhm from yljg_kh_jtxx where jtcyzjhm = #{jtcyzjhm} and jtcyzjlx = #{jtcyzjlx} and jg_id = #{jgId} and kh_id = #{khId})
+        (select jtcyzjhm from yljg_kh_jtxx where jtcyzjhm = #{jtcyzjhm} and jtcyzjlx = #{jtcyzjlx} and jg_id = #{jgId} and kh_id = #{khId} and state = #{state})
     </insert>
 
     <update id="updateYljgKhJtxx" parameterType="YljgKhJtxx">

ruoyi-modules/mz-organization-khgl/src/main/resources/mapper/organization/YljgKhNlpgMapper.xml

@@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectYljgKhNlpgList" parameterType="YljgKhNlpg" resultMap="YljgKhNlpgResult">
         <include refid="selectYljgKhNlpgVo"/>
         <where>
+            and state = '0'
             <if test="xm != null  and xm != ''"> and xm like concat('%', #{xm}, '%')</if>
             <if test="zjhm != null  and zjhm != ''"> and zjhm like concat('%', #{zjhm}, '%')</if>
             <if test="khId != null  and khId != ''"> and kh_id = #{khId}</if>
@@ -58,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="checkYljgKhNlpg" parameterType="YljgKhNlpg" resultMap="YljgKhNlpgResult">
         <include refid="selectYljgKhNlpgVo"/>
         <where>
+            and state = '0'
             <if test="id != null  and id != ''"> and id != #{id}</if>
             <if test="khId != null  and khId != ''"> and kh_id = #{khId}</if>
             <if test="jgId != null  and jgId != ''"> and jg_id = #{jgId}</if>
@@ -66,6 +68,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+    <select id="selectLastNlpg" parameterType="YljgKhNlpg" resultType="String">
+        select id
+        from yljg_kh_nlpg
+        where kh_id = #{khId}
+        order by create_time_str desc limit 1
+    </select>
+
     <select id="selectYljgKhNlpgById" parameterType="String" resultMap="YljgKhNlpgResult">
         <include refid="selectYljgKhNlpgVo"/>
         where id = #{id}

ruoyi-modules/mz-organization-khgl/src/main/resources/mapper/organization/YljgKhRztzxxMapper.xml

@@ -75,22 +75,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         `create_time_str` AS `create_time_str`,
         (
         SELECT
-        `mz-cloud`.`yljg_fwcd_fj`.`fjmc`
+        `sbsj`.`yljg_fwcd_fj`.`fjmc`
         FROM
-        `mz-cloud`.`yljg_fwcd_fj`
+        `sbsj`.`yljg_fwcd_fj`
         WHERE
         (
-        `mz-cloud`.`yljg_fwcd_fj`.`id` = `fj_id`
+        `sbsj`.`yljg_fwcd_fj`.`id` = `fj_id`
         )
         ) AS `rzfj`,
         (
         SELECT
-        `mz-cloud`.`yljg_fwcd_cw`.`cwh`
+        `sbsj`.`yljg_fwcd_cw`.`cwh`
         FROM
-        `mz-cloud`.`yljg_fwcd_cw`
+        `sbsj`.`yljg_fwcd_cw`
         WHERE
         (
-        `mz-cloud`.`yljg_fwcd_cw`.`id` = `cw_id`
+        `sbsj`.`yljg_fwcd_cw`.`id` = `cw_id`
         )
         ) AS `rzcw`,
         `yjrzrq` AS `yjrzrq`,
@@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         `rzzt` AS `rzzt`,
         `create_by` AS `blr`
         FROM
-        `mz-cloud`.`yljg_kh_htxx`
+        `sbsj`.`yljg_kh_htxx`
         <where>
             `status` = '0'
             <if test="xm != null  and xm != ''"> and xm like concat('%', #{xm}, '%')</if>
@@ -128,22 +128,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         `create_time_str` AS `create_time_str`,
         (
         SELECT
-        `mz-cloud`.`yljg_fwcd_fj`.`fjmc`
+        `sbsj`.`yljg_fwcd_fj`.`fjmc`
         FROM
-        `mz-cloud`.`yljg_fwcd_fj`
+        `sbsj`.`yljg_fwcd_fj`
         WHERE
         (
-        `mz-cloud`.`yljg_fwcd_fj`.`id` = `fj_id`
+        `sbsj`.`yljg_fwcd_fj`.`id` = `fj_id`
         )
         ) AS `rzfj`,
         (
         SELECT
-        `mz-cloud`.`yljg_fwcd_cw`.`cwh`
+        `sbsj`.`yljg_fwcd_cw`.`cwh`
         FROM
-        `mz-cloud`.`yljg_fwcd_cw`
+        `sbsj`.`yljg_fwcd_cw`
         WHERE
         (
-        `mz-cloud`.`yljg_fwcd_cw`.`id` = `cw_id`
+        `sbsj`.`yljg_fwcd_cw`.`id` = `cw_id`
         )
         ) AS `rzcw`,
         `yjrzrq` AS `yjrzrq`,
@@ -151,7 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         `rzzt` AS `rzzt`,
         `create_by` AS `blr`
         FROM
-        `mz-cloud`.`yljg_kh_htxx`
+        `sbsj`.`yljg_kh_htxx`
         <where>
             status = '0'
             and sjrzsj is not null and sjrzsj != ''

ruoyi-modules/mz-organization-yggl/src/main/java/com/ruoyi/organization/domain/YljgYgBtxx.java

@@ -79,4 +79,7 @@ public class YljgYgBtxx extends BaseEntity
     @Size(max = 50, message = "{补贴标准}")
     private String btbz;
 
+    @ApiModelProperty(value = "删除状态")
+    private Long state;
+
 }

ruoyi-modules/mz-organization-yggl/src/main/java/com/ruoyi/organization/domain/YljgYgCfxx.java

@@ -76,4 +76,7 @@ public class YljgYgCfxx extends BaseEntity
     @Size(max = 200, message = "{处罚内容}")
     private String cfnr;
 
+    @ApiModelProperty(value = "删除状态")
+    private Long state;
+
 }

ruoyi-modules/mz-organization-yggl/src/main/java/com/ruoyi/organization/domain/YljgYgCyjl.java

@@ -82,4 +82,8 @@ public class YljgYgCyjl extends BaseEntity
     @DateV(pattern = "yyyyMMdd", message = "{离职日期}")
     private String lzsj;
 
+    /** 删除状态 */
+    @ApiModelProperty(value = "删除状态")
+    private Long state;
+
 }

ruoyi-modules/mz-organization-yggl/src/main/java/com/ruoyi/organization/domain/YljgYgJlxx.java

@@ -83,4 +83,8 @@ public class YljgYgJlxx extends BaseEntity
     @Size(max = 500, message = "{奖励信息认证图片}")
     private String jlxxUrl;
 
+    /** 删除状态 */
+    @ApiModelProperty(value = "删除状态")
+    private Long state;
+
 }

ruoyi-modules/mz-organization-yggl/src/main/java/com/ruoyi/organization/domain/YljgYgPxjl.java

@@ -99,4 +99,8 @@ public class YljgYgPxjl extends BaseEntity
     @Size(max = 1000, message = "{备注}")
     private String bz;
 
+    /** 删除状态 */
+    @ApiModelProperty(value = "删除状态")
+    private Long state;
+
 }

ruoyi-modules/mz-organization-yggl/src/main/java/com/ruoyi/organization/domain/YljgYgZzxx.java

@@ -106,5 +106,14 @@ public class YljgYgZzxx extends BaseEntity
     @DictV(type = "XZ119",message = "{证书类型}")
     private String zslx;
 
+    /** 证书有效期 */
+    @Excel(name = "证书有效期")
+    @ApiModelProperty(value = "证书有效期", required = true)
+    private String ahdx6153;
+
+    /** 删除状态 */
+    @ApiModelProperty(value = "删除状态")
+    private Long state;
+
 
 }

ruoyi-modules/mz-organization-yggl/src/main/java/com/ruoyi/organization/service/impl/YljgYgBtxxServiceImpl.java

@@ -100,7 +100,15 @@ public class YljgYgBtxxServiceImpl implements IYljgYgBtxxService
     @Override
     public int deleteYljgYgBtxxByIds(String[] ids)
     {
-        return yljgYgBtxxMapper.deleteYljgYgBtxxByIds(ids);
+
+        for (int i = 0; i < ids.length; i++) {
+            YljgYgBtxx yljgYgBtxx = new YljgYgBtxx();
+            yljgYgBtxx.setId(ids[i]);
+            yljgYgBtxx.setState(1L);
+            yljgYgBtxxMapper.updateYljgYgBtxx(yljgYgBtxx);
+        }
+        return 1;
+//        return yljgYgBtxxMapper.deleteYljgYgBtxxByIds(ids);
     }
 
     /**

ruoyi-modules/mz-organization-yggl/src/main/java/com/ruoyi/organization/service/impl/YljgYgCfxxServiceImpl.java

@@ -72,7 +72,7 @@ public class YljgYgCfxxServiceImpl implements IYljgYgCfxxService
         if(StringUtils.isNotBlank(yljgYgCfxx.getCyryId())){
             YljgYgJbxx yg = new YljgYgJbxx();
             yg.setId(yljgYgCfxx.getCyryId());
-            
+
             if(yljgYgJbxxMapper.selectYljgYgJbxxList(yg).size()!=1){
                 throw new ServiceException("父级信息不存在/失效,操作失败,请检查其信息");
             }
@@ -100,7 +100,14 @@ public class YljgYgCfxxServiceImpl implements IYljgYgCfxxService
     @Override
     public int deleteYljgYgCfxxByIds(String[] ids)
     {
-        return yljgYgCfxxMapper.deleteYljgYgCfxxByIds(ids);
+        for (int i = 0; i < ids.length; i++) {
+            YljgYgCfxx yljgYgCfxx = new YljgYgCfxx();
+            yljgYgCfxx.setId(ids[i]);
+            yljgYgCfxx.setState(1L);
+            yljgYgCfxxMapper.updateYljgYgCfxx(yljgYgCfxx);
+        }
+        return 1;
+//        return yljgYgCfxxMapper.deleteYljgYgCfxxByIds(ids);
     }
 
     /**

ruoyi-modules/mz-organization-yggl/src/main/java/com/ruoyi/organization/service/impl/YljgYgCyjlServiceImpl.java

@@ -71,7 +71,7 @@ public class YljgYgCyjlServiceImpl implements IYljgYgCyjlService
         if(StringUtils.isNotBlank(yljgYgCyjl.getCyryId())){
             YljgYgJbxx yg = new YljgYgJbxx();
             yg.setId(yljgYgCyjl.getCyryId());
-            
+
             if(yljgYgJbxxMapper.selectYljgYgJbxxList(yg).size()!=1){
                 throw new ServiceException("父级信息不存在/失效,操作失败,请检查其信息");
             }
@@ -99,7 +99,14 @@ public class YljgYgCyjlServiceImpl implements IYljgYgCyjlService
     @Override
     public int deleteYljgYgCyjlByIds(String[] ids)
     {
-        return yljgYgCyjlMapper.deleteYljgYgCyjlByIds(ids);
+        for (int i = 0; i < ids.length; i++) {
+            YljgYgCyjl yljgYgCyjl = new YljgYgCyjl();
+            yljgYgCyjl.setId(ids[i]);
+            yljgYgCyjl.setState(1L);
+            yljgYgCyjlMapper.updateYljgYgCyjl(yljgYgCyjl);
+        }
+        return 1;
+//        return yljgYgCyjlMapper.deleteYljgYgCyjlByIds(ids);
     }
 
     /**

ruoyi-modules/mz-organization-yggl/src/main/java/com/ruoyi/organization/service/impl/YljgYgJbxxServiceImpl.java

@@ -26,6 +26,7 @@ import com.ruoyi.system.utils.IDCardUtil;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -304,6 +305,7 @@ public class YljgYgJbxxServiceImpl implements IYljgYgJbxxService
         return yljgYgJbxxMapper.updateYljgYgJbxx(yljgYgJbxx);
     }
 
+    @Transactional
     public int updateYljgHlyJtZt(YljgYgJbxx yljgYgJbxx)
     {
         if("05".equals(yljgYgJbxx.getJtffZt())){

ruoyi-modules/mz-organization-yggl/src/main/java/com/ruoyi/organization/service/impl/YljgYgJlxxServiceImpl.java

@@ -71,7 +71,7 @@ public class YljgYgJlxxServiceImpl implements IYljgYgJlxxService
         if(StringUtils.isNotBlank(yljgYgJlxx.getCyryId())){
             YljgYgJbxx yg = new YljgYgJbxx();
             yg.setId(yljgYgJlxx.getCyryId());
-            
+
             if(yljgYgJbxxMapper.selectYljgYgJbxxList(yg).size()!=1){
                 throw new ServiceException("父级信息不存在/失效,操作失败,请检查其信息");
             }
@@ -99,7 +99,14 @@ public class YljgYgJlxxServiceImpl implements IYljgYgJlxxService
     @Override
     public int deleteYljgYgJlxxByIds(String[] ids)
     {
-        return yljgYgJlxxMapper.deleteYljgYgJlxxByIds(ids);
+        for (int i = 0; i < ids.length; i++) {
+            YljgYgJlxx yljgYgJlxx = new YljgYgJlxx();
+            yljgYgJlxx.setId(ids[i]);
+            yljgYgJlxx.setState(1L);
+            yljgYgJlxxMapper.updateYljgYgJlxx(yljgYgJlxx);
+        }
+        return 1;
+//        return yljgYgJlxxMapper.deleteYljgYgJlxxByIds(ids);
     }
 
     /**

ruoyi-modules/mz-organization-yggl/src/main/java/com/ruoyi/organization/service/impl/YljgYgPxjlServiceImpl.java

@@ -71,7 +71,7 @@ public class YljgYgPxjlServiceImpl implements IYljgYgPxjlService
         if(StringUtils.isNotBlank(yljgYgPxjl.getCyryId())){
             YljgYgJbxx yg = new YljgYgJbxx();
             yg.setId(yljgYgPxjl.getCyryId());
-            
+
             if(yljgYgJbxxMapper.selectYljgYgJbxxList(yg).size()!=1){
                 throw new ServiceException("父级信息不存在/失效,操作失败,请检查其信息");
             }
@@ -99,7 +99,14 @@ public class YljgYgPxjlServiceImpl implements IYljgYgPxjlService
     @Override
     public int deleteYljgYgPxjlByIds(String[] ids)
     {
-        return yljgYgPxjlMapper.deleteYljgYgPxjlByIds(ids);
+        for (int i = 0; i < ids.length; i++) {
+            YljgYgPxjl yljgYgPxjl = new YljgYgPxjl();
+            yljgYgPxjl.setId(ids[i]);
+            yljgYgPxjl.setState(1L);
+            yljgYgPxjlMapper.updateYljgYgPxjl(yljgYgPxjl);
+        }
+        return 1;
+//        return yljgYgPxjlMapper.deleteYljgYgPxjlByIds(ids);
     }
 
     /**

ruoyi-modules/mz-organization-yggl/src/main/java/com/ruoyi/organization/service/impl/YljgYgZzxxServiceImpl.java

@@ -71,7 +71,7 @@ public class YljgYgZzxxServiceImpl implements IYljgYgZzxxService
         if(StringUtils.isNotBlank(yljgYgZzxx.getCyryId())){
             YljgYgJbxx yg = new YljgYgJbxx();
             yg.setId(yljgYgZzxx.getCyryId());
-            
+
             if(yljgYgJbxxMapper.selectYljgYgJbxxList(yg).size()!=1){
                 throw new ServiceException("父级信息不存在/失效,操作失败,请检查其信息");
             }
@@ -100,7 +100,14 @@ public class YljgYgZzxxServiceImpl implements IYljgYgZzxxService
     @Override
     public int deleteYljgYgZzxxByIds(String[] ids)
     {
-        return yljgYgZzxxMapper.deleteYljgYgZzxxByIds(ids);
+        for (int i = 0; i < ids.length; i++) {
+            YljgYgZzxx yljgYgZzxx = new YljgYgZzxx();
+            yljgYgZzxx.setId(ids[i]);
+            yljgYgZzxx.setState(1L);
+            yljgYgZzxxMapper.updateYljgYgZzxx(yljgYgZzxx);
+        }
+        return 1;
+//        return yljgYgZzxxMapper.deleteYljgYgZzxxByIds(ids);
     }
 
     /**

ruoyi-modules/mz-organization-yggl/src/main/resources/mapper/organization/YljgYgBtxxMapper.xml

@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectYljgYgBtxxList" parameterType="YljgYgBtxx" resultMap="YljgYgBtxxResult">
         <include refid="selectYljgYgBtxxVo"/>
         <where>
+            and state = '0'
             <if test="cyryId != null  and cyryId != ''"> and cyry_id = #{cyryId}</if>
             <if test="id != null  and id != ''"> and id = #{id}</if>
             <if test="jgId != null  and jgId != ''"> and jg_id = #{jgId}</if>
@@ -98,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="btbz != null">btbz = #{btbz},</if>
             <if test="cyryId != null and cyryId != ''">cyry_id = #{cyryId},</if>
             <if test="jgId != null">jg_id = #{jgId},</if>
+            <if test="state != null">state = #{state},</if>
             update_time_str = #{updateTimeStr},
             update_user_id = #{updateUserId},
             update_by = #{updateBy},

ruoyi-modules/mz-organization-yggl/src/main/resources/mapper/organization/YljgYgCfxxMapper.xml

@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectYljgYgCfxxList" parameterType="YljgYgCfxx" resultMap="YljgYgCfxxResult">
         <include refid="selectYljgYgCfxxVo"/>
         <where>
+            and state = '0'
             <if test="cyryId != null  and cyryId != ''"> and cyry_id = #{cyryId}</if>
             <if test="id != null  and id != ''"> and id = #{id}</if>
             <if test="jgId != null  and jgId != ''"> and jg_id = #{jgId}</if>
@@ -98,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cfdwmc != null and cfdwmc != ''">cfdwmc = #{cfdwmc},</if>
             <if test="cyryId != null and cyryId != ''">cyry_id = #{cyryId},</if>
             <if test="jgId != null">jg_id = #{jgId},</if>
+            <if test="state != null">state = #{state},</if>
             update_time_str = #{updateTimeStr},
             update_user_id = #{updateUserId},
             update_by = #{updateBy},

ruoyi-modules/mz-organization-yggl/src/main/resources/mapper/organization/YljgYgCyjlMapper.xml

@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectYljgYgCyjlList" parameterType="YljgYgCyjl" resultMap="YljgYgCyjlResult">
         <include refid="selectYljgYgCyjlVo"/>
         <where>
+            and state = '0'
             <if test="dwmc != null  and dwmc != ''"> and dwmc = #{dwmc}</if>
             <if test="zylx != null  and zylx != ''"> and zylx = #{zylx}</if>
             <if test="rzsj != null  and rzsj != ''"> and rzsj = #{rzsj}</if>
@@ -106,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lzsj != null">lzsj = #{lzsj},</if>
             <if test="cyryId != null and cyryId != ''">cyry_id = #{cyryId},</if>
             <if test="jgId != null">jg_id = #{jgId},</if>
+            <if test="state != null">state = #{state},</if>
             update_time_str = #{updateTimeStr},
             update_user_id = #{updateUserId},
             update_by = #{updateBy},

ruoyi-modules/mz-organization-yggl/src/main/resources/mapper/organization/YljgYgJlxxMapper.xml

@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectYljgYgJlxxList" parameterType="YljgYgJlxx" resultMap="YljgYgJlxxResult">
         <include refid="selectYljgYgJlxxVo"/>
         <where>
+            and state = '0'
             <if test="cyryId != null  and cyryId != ''"> and cyry_id = #{cyryId}</if>
             <if test="id != null  and id != ''"> and id = #{id}</if>
             <if test="jgId != null  and jgId != ''"> and jg_id = #{jgId}</if>
@@ -102,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jldwmc != null and jldwmc != ''">jldwmc = #{jldwmc},</if>
             <if test="cyryId != null and cyryId != ''">cyry_id = #{cyryId},</if>
             <if test="jgId != null">jg_id = #{jgId},</if>
+            <if test="state != null">state = #{state},</if>
             update_time_str = #{updateTimeStr},
             update_user_id = #{updateUserId},
             update_by = #{updateBy},

ruoyi-modules/mz-organization-yggl/src/main/resources/mapper/organization/YljgYgPxjlMapper.xml

@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectYljgYgPxjlList" parameterType="YljgYgPxjl" resultMap="YljgYgPxjlResult">
         <include refid="selectYljgYgPxjlVo"/>
         <where>
+            and state = '0'
             <if test="cyryId != null  and cyryId != ''"> and cyry_id = #{cyryId}</if>
             <if test="jgId != null  and jgId != ''"> and jg_id = #{jgId}</if>
         </where>
@@ -109,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pxbtje != null">pxbtje = #{pxbtje},</if>
             <if test="cyryId != null and cyryId != ''">cyry_id = #{cyryId},</if>
             <if test="jgId != null and jgId != ''">jg_id = #{jgId},</if>
+            <if test="state != null">state = #{state},</if>
             update_time_str = #{updateTimeStr},
             update_user_id = #{updateUserId},
             update_by = #{updateBy},

ruoyi-modules/mz-organization-yggl/src/main/resources/mapper/organization/YljgYgZzxxMapper.xml

@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="zsnx"    column="zsnx"    />
         <result property="bz"    column="bz"    />
         <result property="zzxxUrl"    column="zzxx_url"    />
+        <result property="ahdx6153"    column="ahdx6153"    />
         <result property="createTimeStr"    column="create_time_str"    />
         <result property="createUserId"    column="create_user_id"    />
         <result property="createUserType"    column="create_user_type"    />
@@ -35,12 +36,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectYljgYgZzxxVo">
-        select zslx, zsmc, zsbh, zsrq, zsdw, zsnx, bz, zzxx_url, id, cyry_id, jg_id, create_time_str, create_user_id, create_by, create_unit,create_tounit,create_bmjsc,create_qhjsc, create_unit_name, update_time_str, update_user_id, update_by, update_unit, update_unit_name from yljg_yg_zzxx
+        select zslx, zsmc, zsbh, zsrq, zsdw, zsnx, bz, zzxx_url, ahdx6153, id, cyry_id, jg_id, create_time_str, create_user_id, create_by, create_unit,create_tounit,create_bmjsc,create_qhjsc, create_unit_name, update_time_str, update_user_id, update_by, update_unit, update_unit_name from yljg_yg_zzxx
     </sql>
 
     <select id="selectYljgYgZzxxList" parameterType="YljgYgZzxx" resultMap="YljgYgZzxxResult">
         <include refid="selectYljgYgZzxxVo"/>
         <where>
+            and state = '0'
             <if test="id != null  and id != ''"> and id = #{id}</if>
             <if test="cyryId != null  and cyryId != ''"> and cyry_id = #{cyryId}</if>
             <if test="jgId != null  and jgId != ''"> and jg_id = #{jgId}</if>
@@ -115,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zzxxUrl != null">zzxx_url = #{zzxxUrl},</if>
             <if test="cyryId != null and cyryId != ''">cyry_id = #{cyryId},</if>
             <if test="jgId != null">jg_id = #{jgId},</if>
+            <if test="state != null">state = #{state},</if>
             update_time_str = #{updateTimeStr},
             update_user_id = #{updateUserId},
             update_by = #{updateBy},

ruoyi-ui/src/views/business/fwjggl/bzgl/xjdwgl/index.vue

@@ -258,7 +258,7 @@ export default {
           { required: true, message: "被表彰日期不能为空", trigger: "blur" },
         ],
         bzdw: [
-          { max: 100, message: '表彰单位不能超过100个字符', trigger: 'blur'},
+          { required: true,max: 100, message: '表彰单位不能超过100个字符', trigger: 'blur'},
         ],
         xjsj: [
           { required: true, message: "先进事迹不能为空", trigger: "blur" },

ruoyi-ui/src/views/business/fwjggl/bzgl/xjgrgl/index.vue

@@ -287,7 +287,7 @@ export default {
           { required: true, message: "表彰日期 不能为空", trigger: "blur" },
         ],
         bzdw: [
-          { max: 100, message: '表彰单位不能超过100个字符', trigger: 'blur' },
+          { required: true,max: 100, message: '表彰单位不能超过100个字符', trigger: 'blur' },
         ],
         xjsj: [
           { required: true, message: "先进事迹 不能为空", trigger: "blur" },

ruoyi-ui/src/views/organization/yggl/ygBtxx/table.vue

@@ -173,7 +173,7 @@ export default {
             {required: true, message: "接受补贴日期不能为空", trigger: "blur"}
           ],
           btbz: [
-            { max: 50, message: '补贴标准不能超过50个字符', trigger: 'blur'}
+            {required: true, max: 50, message: '补贴标准不能超过50个字符', trigger: 'blur'}
           ],
         },
         cyryId:null,

ruoyi-ui/src/views/organization/yggl/ygCfxx/table.vue

@@ -132,7 +132,10 @@ export default {
           { max: 72, message: '处罚单位名称不能超过72个字符', trigger: 'blur'}
         ],
         cfyl: [
-          { max: 100, message: '处罚原因不能超过100个字符', trigger: 'blur'}
+          { required: true,max: 100, message: '处罚原因不能超过100个字符', trigger: 'blur'}
+        ],
+        cfnr: [
+          { required: true,max: 200, message: '处罚内容不能超过200个字符', trigger: 'blur'}
         ],
       },
       cyryId:null,

ruoyi-ui/src/views/organization/yggl/ygCyjl/table.vue

@@ -160,6 +160,15 @@ export default {
         qtZylx:[
           { max: 50, message: '其它职业类型不能超过50个字符', trigger: 'blur'}
         ],
+        zylx: [
+          { required: true, message: '职业类型不能为空', trigger: 'change' }
+        ],
+        rzsj: [
+          { required: true, message: '入职时间不能为空', trigger: 'change' }
+        ],
+        lzsj: [
+          { required: true, message: '离职时间不能为空', trigger: 'change' }
+        ],
       },
       cyryId:null,
       isOther:true

ruoyi-ui/src/views/organization/yggl/ygJlxx/table.vue

@@ -70,12 +70,12 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="奖励原因" prop="jlyy">
-          <el-input v-model="form.jlyy" type="textarea" maxlength="200" show-word-limit placeholder="请输入内容" />
+          <el-input v-model="form.jlyy" type="textarea" maxlength="100" show-word-limit placeholder="请输入内容" />
         </el-form-item>
         <el-form-item label="奖励内容" prop="jlnr">
-          <el-input v-model="form.jlnr" type="textarea" maxlength="200" show-word-limit placeholder="请输入内容" />
+          <el-input v-model="form.jlnr" type="textarea" maxlength="100" show-word-limit placeholder="请输入内容" />
         </el-form-item>
-	      <el-form-item label="荣誉附件" prop="jlxxUrl">
+	      <el-form-item label="奖励信息附件" prop="jlxxUrl">
 		      <file-upload v-model="form.jlxxUrl" :limit="5" :fileSize="8" :fileType="['jpg', 'jpeg', 'png']"></file-upload>
 	      </el-form-item>
       </el-form>
@@ -134,8 +134,16 @@ export default {
           { max: 120, message: '奖励单位名称不能超过120个字符', trigger: 'blur'}
         ],
 	      jlxxUrl:[
-		      {required: true, message: "荣誉附件不能为空", trigger: "change"}
+		      {required: true, message: "奖励信息附件不能为空", trigger: "change"}
 	      ],
+        jlyy: [
+          { required: true, message: "奖励原因不能为空", trigger: "blur" },
+          { max: 100, message: '奖励原因不能超过100个字符', trigger: 'blur'}
+        ],
+        jlnr: [
+          { required: true, message: "奖励内容不能为空", trigger: "blur" },
+          { max: 100, message: '奖励内容不能超过100个字符', trigger: 'blur'}
+        ],
       },
       cyryId:null,
     };

ruoyi-ui/src/views/organization/yggl/ygZzxx/table.vue

@@ -33,7 +33,12 @@
         </template>
       </el-table-column>
       <el-table-column label="证书颁发单位" align="center" prop="zsdw" />
-      <el-table-column label="证书有效期(年)" align="center" prop="zsnx" />
+<!--      <el-table-column label="证书有效期(年)" align="center" prop="zsnx" />-->
+      <el-table-column label="证书有效期(截止时间)" align="center" prop="ahdx6153">
+        <template slot-scope="scope">
+          <span>{{ special(scope.row.ahdx6153) }}</span>
+        </template>
+      </el-table-column>
 	    <el-table-column label="证书附件" align="center" prop="zzxxUrl">
 		    <template slot-scope="scope">
 			    <image-preview :src="scope.row.zzxxUrl" :width="50" :height="50" />
@@ -93,9 +98,17 @@
         <el-form-item label="证书颁发单位" prop="zsdw">
           <el-input v-model="form.zsdw" placeholder="请输入证书颁发单位" />
         </el-form-item>
-        <el-form-item label="证书有效期(年)" prop="zsnx">
-          <number v-model.sync="form.zsnx" placeholder="证书有效期" :precision="0"/>
+        <el-form-item label="证书有效期(截止时间)" prop="ahdx6153">
+          <el-date-picker clearable
+                          v-model="form.ahdx6153"
+                          type="date"
+                          value-format="yyyyMMdd"
+                          placeholder="请选择证书有效期(截止时间)">
+          </el-date-picker>
         </el-form-item>
+<!--        <el-form-item label="证书有效期(年)" prop="zsnx">-->
+<!--          <number v-model.sync="form.zsnx" placeholder="证书有效期" :precision="0"/>-->
+<!--        </el-form-item>-->
         <el-form-item label="备注" prop="bz">
           <el-input v-model="form.bz" type="textarea"  maxlength="300" show-word-limit placeholder="请输入内容" />
         </el-form-item>
@@ -165,11 +178,14 @@ export default {
         zsrq: [
           { required: true, message: "证书获取日期不能为空", trigger: "blur" }
         ],
-        zsnx:[
-          { validator: validateMoney, trigger: "blur" }
+        ahdx6153: [
+          { required: true, message: "证书有效期(截止时间)不能为空", trigger: "blur" }
         ],
+        // zsnx:[
+        //   { required: true,validator: validateMoney, trigger: "blur" }
+        // ],
         zsdw: [
-          { max: 50, message: '证书颁发单位不能超过50个字符', trigger: 'blur'}
+          { required: true,max: 50, message: '证书颁发单位不能超过50个字符', trigger: 'blur'}
         ],
 	      zzxxUrl:[
 		      {required: true, message: "职业资格证附件不能为空", trigger: "change"}
@@ -232,6 +248,7 @@ export default {
 	      zslx: null,
         zsbh: null,
         zsrq: null,
+        ahdx6153: null,
         zsdw: null,
         zsnx: undefined,
         bz: null,

ruoyi-ui/src/views/search/xxcx/fwjg/sqyljg/cyry/commonality/tableCfxx.vue

@@ -103,7 +103,10 @@ export default {
           { max: 72, message: '处罚单位名称不能超过72个字符', trigger: 'blur'}
         ],
         cfyl: [
-          { max: 100, message: '处罚原因不能超过100个字符', trigger: 'blur'}
+          { required: true,max: 100, message: '处罚原因不能超过100个字符', trigger: 'blur'}
+        ],
+        cfnr: [
+          { required: true,max: 200, message: '处罚内容不能超过200个字符', trigger: 'blur'}
         ],
       },
       cyryId:null,

ruoyi-ui/src/views/search/xxcx/fwjg/sqyljg/cyry/commonality/tableCyjl.vue

@@ -131,6 +131,15 @@ export default {
         qtZylx:[
           { max: 50, message: '其它职业类型不能超过50个字符', trigger: 'blur'}
         ],
+        zylx: [
+          { required: true, message: '职业类型不能为空', trigger: 'change' }
+        ],
+        rzsj: [
+          { required: true, message: '入职时间不能为空', trigger: 'change' }
+        ],
+        lzsj: [
+          { required: true, message: '离职时间不能为空', trigger: 'change' }
+        ],
       },
       cyryId:null,
       isOther:true

ruoyi-ui/src/views/search/xxcx/fwjg/sqyljg/cyry/commonality/tableJlxx.vue

@@ -40,10 +40,10 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="奖励原因" prop="jlyy">
-          <el-input v-model="form.jlyy" type="textarea" maxlength="200" show-word-limit placeholder="请输入内容" />
+          <el-input v-model="form.jlyy" type="textarea" maxlength="100" show-word-limit placeholder="请输入内容" />
         </el-form-item>
         <el-form-item label="奖励内容" prop="jlnr">
-          <el-input v-model="form.jlnr" type="textarea" maxlength="200" show-word-limit placeholder="请输入内容" />
+          <el-input v-model="form.jlnr" type="textarea" maxlength="100" show-word-limit placeholder="请输入内容" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -101,6 +101,14 @@ export default {
           { required: true, message: "奖励单位名称不能为空", trigger: "blur" },
           { max: 120, message: '奖励单位名称不能超过120个字符', trigger: 'blur'}
         ],
+        jlyy: [
+          { required: true, message: "奖励原因不能为空", trigger: "blur" },
+          { max: 100, message: '奖励原因不能超过100个字符', trigger: 'blur'}
+        ],
+        jlnr: [
+          { required: true, message: "奖励内容不能为空", trigger: "blur" },
+          { max: 100, message: '奖励内容不能超过100个字符', trigger: 'blur'}
+        ],
       },
       cyryId:null,
     };