Merge branch 'lal' into develop

src/main/java/cn/timer/api/bean/xcgl/XcglAdminXzz.java

@@ -77,5 +77,10 @@ public class XcglAdminXzz extends Model<XcglAdminXzz> {
 	@ApiModelProperty(value="算薪月份",example="2019-12")
 	@ApiModelProperty(value="算薪月份",example="2019-12")
     private String xzyf;
     private String xzyf;
     
     
+	@ApiModelProperty(value="薪资规则确定（0：未确定；1：已确定）",example="2019-12")
+    private Integer isXzgz;
+	
+	@ApiModelProperty(value="薪资锁定（0：未锁定；1：已锁定）",example="2019-12")
+    private Integer isXzsd;
 
 
 }
 }
\ No newline at end of file

src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java

@@ -1305,6 +1305,20 @@ public class SalaryManagementController {
 		
 		
 	}
 	}
 	
 	
+	@PostMapping(value = "/determinesalaryrules")
+	@ApiOperation(value = "是否确定薪资规则", httpMethod = "POST", notes = "接口发布说明")
+	public Result<Object> DetermineSalaryRules(@CurrentUser UserBean userBean,@RequestBody SalaryRulesDto salaryrulesdto) {
+		XcglAdminXzz.builder().id(salaryrulesdto.getXzzid()).isXzgz(salaryrulesdto.getState()).build().updateById();
+		return ResultUtil.success("操作成功!");
+	}
+	
+	@PostMapping(value = "/locksalary")
+	@ApiOperation(value = "是否锁定薪资", httpMethod = "POST", notes = "接口发布说明")
+	public Result<Object> LockSalary(@CurrentUser UserBean userBean,@RequestBody SalaryRulesDto salaryrulesdto) {
+		XcglAdminXzz.builder().id(salaryrulesdto.getXzzid()).isXzsd(salaryrulesdto.getState()).build().updateById();
+		return ResultUtil.success("操作成功!");
+	}
+	
 	
 	
 	/**
 	/**
 	 *	查看薪资
 	 *	查看薪资

src/main/java/cn/timer/api/dto/xcgl/SalaryRulesDto.java

+package cn.timer.api.dto.xcgl;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SalaryRulesDto {
+	Integer xzzid;
+	Integer state;//0 未
+}

src/main/resources/mapping/xcgl/XcglAdminXzzMapper.xml

@@ -17,6 +17,9 @@
                 <result column="pxfs" property="pxfs" />
                 <result column="pxfs" property="pxfs" />
                 <result column="monthtime" property="monthtime" />
                 <result column="monthtime" property="monthtime" />
                 <result column="xzyf" property="xzyf" />
                 <result column="xzyf" property="xzyf" />
+                
+                <result column="is_xzgz" property="isXzgz" />
+                <result column="is_xzsd" property="isXzsd" />
     </resultMap>
     </resultMap>
     
     
     <resultMap id="PayrollExceptionDtoMap" type="cn.timer.api.dto.xcgl.PayrollExceptionDto" >
     <resultMap id="PayrollExceptionDtoMap" type="cn.timer.api.dto.xcgl.PayrollExceptionDto" >