8小时后台--

合同页面-已签订
面试登记表详情页面
运营后台--
企业名称重复

src/main/java/cn/timer/api/bean/insure/InsureUser.java

@@ -158,4 +158,8 @@ public class InsureUser extends Model<InsureUser> {
 	@ApiModelProperty(value = "批改原因")
 	private String reason;
 
+	@ApiModelProperty(value = "批改原因")
+	private Date createTime;
+
+
 }

src/main/java/cn/timer/api/controller/qyzx/QyzxController.java

@@ -676,6 +676,10 @@ public class QyzxController {
 		boolean b1;
 		if (q == null) {
 			try {
+				QyzxEntInfoM gsif = QyzxEntInfoM.builder().build().selectOne(new QueryWrapper<QyzxEntInfoM>().lambda().eq(QyzxEntInfoM::getName, qyzxEntInfoM.getName()));
+				if(gsif!=null){
+					return ResultUtil.error("企业名称已存在");
+				}
 				qyzxEntInfoM.setRegisterTime(new Date());
 			QyzxEmpLogin login = new LambdaQueryChainWrapper<QyzxEmpLogin>(qyzxEmpLoginMapper)
 					.eq(!StrUtil.hasBlank(qyzxEntInfoM.getPhone()), QyzxEmpLogin::getPhone, qyzxEntInfoM.getPhone()).one();

src/main/java/cn/timer/api/controller/yggl/YgglController.java

@@ -2098,11 +2098,16 @@ public class YgglController {
 		List<YgglEmpLzyy> ygglEmpLzyyList = YgglEmpLzyy.builder().build().selectList(new QueryWrapper<YgglEmpLzyy>().lambda().eq(YgglEmpLzyy::getOrgCode,userBean.getOrgCode()));
 		return ResultUtil.data(ygglEmpLzyyList);
 	}
-	@GetMapping(value = "/getContract")
-	@ApiOperation(value = "72.运营后台--合同概况列表", httpMethod = "GET", notes = "接口发布说明")
+	@PostMapping(value = "/getContract")
+	@ApiOperation(value = "72.运营后台--合同概况列表", httpMethod = "POST", notes = "接口发布说明")
 	@ApiOperationSupport(order = 72)
-	public Result<Object> getContract(@CurrentUser UserBean userBean) {
-		List<HtgkDto> htgkDtos = ygglAttaHtxxbMapper.queryContract(userBean.getOrgCode());
+	public Result<Object> getContract(@CurrentUser UserBean userBean,@RequestBody HtgkDto htgkDto) {
+		List<HtgkDto> htgkDtos=Lists.newArrayList();
+		if(htgkDto.getType()!=2){
+			 htgkDtos = ygglAttaHtxxbMapper.selectListByType(htgkDto.getType());
+		}else {
+			 htgkDtos = ygglAttaHtxxbMapper.queryContract(userBean.getOrgCode());
+		}
 		return ResultUtil.data(htgkDtos);
 	}
 

src/main/java/cn/timer/api/controller/zpgl/ZpglController.java

@@ -518,6 +518,11 @@ public class ZpglController {
                     new QueryWrapper<ZpglRcxxTrain>().lambda().eq(ZpglRcxxTrain::getZpglRcxxId, zpglRcxxId)
                             .eq(ZpglRcxxTrain::getIsDelete, 0).orderByDesc(ZpglRcxxTrain::getEndTime)
             );
+            // 家庭资料
+            List<ZpglRcxxJtzl> zpglRcxxJtzls = ZpglRcxxJtzl.builder().build().selectList(
+                    new QueryWrapper<ZpglRcxxJtzl>().lambda().eq(ZpglRcxxJtzl::getZpglRcxxId, zpglRcxxId)
+                            .eq(ZpglRcxxJtzl::getIsDelete, 0).orderByDesc(ZpglRcxxJtzl::getCreateTime)
+            );
 
             // FPA性格测评数据
             ZpglDtk zpglDtk = ZpglDtk.builder().build().selectOne(new QueryWrapper<ZpglDtk>().lambda().eq(ZpglDtk::getZpglRcxxId, zpglRcxxId));
@@ -533,6 +538,7 @@ public class ZpglController {
             map.put("zpglRcxxTrains", zpglRcxxTrains);
             map.put("zpglDtk", zpglDtk);
             map.put("zpglRcxxOffer", zpglRcxxOffer);
+            map.put("zpglRcxxJtzls",zpglRcxxJtzls);
             return ResultUtil.data(map, "搜索成功");
 
         } catch (Exception e) {

src/main/java/cn/timer/api/dao/yggl/YgglAttaHtxxbMapper.java

 package cn.timer.api.dao.yggl;
 import cn.timer.api.dto.yggl.HtgkDto;
+import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -18,6 +19,8 @@ public interface YgglAttaHtxxbMapper extends BaseMapper<YgglAttaHtxxb> {
 
  List<HtgkDto> queryContract(@Param("orgCode") Integer orgCode);
 
+ List<HtgkDto> selectListByType(@Param("type") Integer type);
+
 
 
 }

src/main/java/cn/timer/api/dto/yggl/HtgkDto.java

@@ -29,4 +29,17 @@ public class HtgkDto implements Serializable{
 	@ApiModelProperty(value="合同签约公司",example="合同签约公司")
 	private String companyName;
 
+	@ApiModelProperty(value="id",example="合同签约公司")
+	private Integer id;
+	private String userName;
+	private String	headUrl;
+	private String deptName;
+	private Integer jobType;
+	private String htId;
+	private Integer type;
+	private Integer status;
+	private Integer htqx;
+	private Date statTime;
+	private Date endTime;
+	private Integer empNum;
 }

src/main/resources/mapping/insure/InsureUserMapper.xml

@@ -312,10 +312,11 @@
                 and iu.insure_status = #{policyDto.status}
             </if>
         </where>
+                order by iu.policy_date_start desc
         <if test="policyDto.page.offset != null and policyDto.page.totalPage !=null">
             LIMIT #{policyDto.page.offset},#{policyDto.page.totalPage}
         </if>
-            order by iu.policy_date_start desc
+
     </select>
 
     <select id="totalUser" resultType="java.lang.Integer">

src/main/resources/mapping/yggl/YgglAttaHtxxbMapper.xml

@@ -167,4 +167,27 @@
         FROM `zpgl_company` zc
     </select>
 
+    <select id="selectListByType" resultType="cn.timer.api.dto.yggl.HtgkDto">
+        SELECT
+            yh.id as id,
+            yh.emp_num as empNum,
+            ye.name as userName,
+            ye.head_url as headUrl,
+            zm.name as deptName,
+            ye.job_type as jobType,
+            yh.ht_id as htId,
+            yh.type as type,
+            zc.company_name as companyName,
+            yh.status as status,
+            yh.htqx as htqx,
+            yh.start_time as statTime,
+            yh.end_time as endTime
+        FROM
+            yggl_atta_htxxb yh
+                LEFT JOIN yggl_main_emp ye ON ( ye.emp_num = yh.emp_num AND ye.org_code = yh.org_code )
+                LEFT JOIN zzgl_bmgw_m zm ON zm.id = ye.bmgw_id
+                LEFT JOIN zpgl_company zc ON zc.id = yh.htqygs
+        where yh.jc_status = #{type}
+    </select>
+
 </mapper>