薪资调整

jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java

@@ -301,4 +301,5 @@ public interface ISysBaseAPI {
 	public List<String> getDepartByUsernameByOrg(String username);
 
 	public int getIncidentTicket(String id);
+	public int getIncidentTicketChild(String id);
 }

jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActBusinessController.java

@@ -404,15 +404,24 @@ public class ActBusinessController {
                 int isConfirm =  busiData.get("is_confirm") == null ? 0 : (Integer) busiData.get("is_confirm");
                 String ticketId =  busiData.get("id").toString();
 
-                int countNum = sysBaseAPI.getIncidentTicket(ticketId);
+                int countNumChild = sysBaseAPI.getIncidentTicketChild(ticketId);//扣款
+//                int countNum = sysBaseAPI.getIncidentTicket(ticketId);//非公司承担
                 List<Map<String,String>> countSupplier = new ArrayList<>();
 
                 if(StringUtils.isNotBlank(responsibility_company)){
                     countSupplier = getSupplierSrm(responsibility_company);
                 }
+
+                if(StringUtils.isNotBlank(responsibility_company) && countNumChild > 0 && countSupplier.size() == 0){
+                    String factorySignature = busiData.get("factory_signature") == null || busiData.get("factory_signature") == "" ? "" : busiData.get("factory_signature").toString();
+                    if(StringUtils.isBlank(factorySignature)||factorySignature.equals("[]")){
+                        return Result.error("该事故单工厂签章为空，请上传后提交");
+                    }
+                }
+
                 if(isConfirm != 1 && StringUtils.isNotBlank(responsibility_company)){
 
-                    if(countNum > 0){
+                    if(countNumChild > 0){
 
                         if(countSupplier.size() > 0 ){
                             return Result.error("该事故单供应商还未确认，请确认后再次提交");
@@ -420,12 +429,12 @@ public class ActBusinessController {
                     }
 
                 }
-                if(StringUtils.isBlank(responsibility_company) || countNum == 0 || countSupplier.size() == 0){
-                    String factorySignature = busiData.get("factory_signature") == null || busiData.get("factory_signature") == "" ? "" : busiData.get("factory_signature").toString();
-                    if(StringUtils.isBlank(factorySignature)){
-                        return Result.error("该事故单工厂签章必填，请上传后提交");
-                    }
-                }
+//                if(StringUtils.isNotBlank(responsibility_company) && countNumChild > 0){
+//                    String factorySignature = busiData.get("factory_signature") == null || busiData.get("factory_signature") == "" ? "" : busiData.get("factory_signature").toString();
+//                    if(StringUtils.isBlank(factorySignature)||factorySignature.equals("[]")){
+//                        return Result.error("该事故单工厂签章必填，请上传后提交");
+//                    }
+//                }
             }catch (Exception e){
                 return Result.error("该事故单供应商还未确认，请刷新后重试");
             }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/IncidentTicketController.java

@@ -500,6 +500,22 @@ public class IncidentTicketController {
 
 		}
 
+		//	是否确认（1是0否）
+		String isConfirm =  incidentTicket.getIsConfirm();
+		//推送u8标识（1表示推送）
+		String setPushFlag =  incidentTicket.getPushFlag();
+		if(StringUtils.isNotBlank(setPushFlag) && "1".equals(setPushFlag)){
+			return Result.ok("该单据无需推送U8,请直接执行下一步操作");
+		}
+
+		//已确认的无需推送到u8,直接进行下一步
+		if(StringUtils.isNotBlank(isConfirm) && "1".equals(isConfirm)){
+
+			incidentTicket.setState("4");
+			incidentTicket.setPushFlag("1");
+			incidentTicketService.updateById(incidentTicket);
+			return Result.ok("执行成功（该单据无需推送U8,请直接执行下一步操作）");
+		}
 		String date1 = DateUtils.formatDate(incidentTicket.getInvoicingDate(),"yyyy-MM-dd");
 		String date2 = DateUtils.formatDate(incidentTicket.getUpdateTime(),"yyyy-MM-dd");
 //		System.out.println(date1.compareTo(date2));

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/entity/IncidentTicket.java

@@ -242,6 +242,10 @@ public class IncidentTicket implements Serializable {
     private String department;
 	//扣款状态
     private String deductionStatus;
+    //推送u8标识（1表示推送）
+    private String pushFlag;
+//	是否确认（1是0否）
+    private String isConfirm;
     //扣款金额
     private BigDecimal deductionAmount;
 

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/vo/IncidentTicketPage.java

@@ -234,6 +234,8 @@ public class IncidentTicketPage {
 	private String deductionStatus;
 	//扣款金额
 	private BigDecimal deductionAmount;
+	//推送u8标识（1表示推送）
+	private String pushFlag;
 
 	@ExcelCollection(name="森_工厂质量事故单-子表")
 	@ApiModelProperty(value = "森_工厂质量事故单-子表")

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -1314,6 +1314,10 @@ public class SysUserController {
 			user.setUsername(username);
 			user.setRealname(username);
 			user.setPassword(passwordEncode);
+
+            String password2 = MD5Util.MD5Encode(password,"");
+            user.setPassword2(password2);
+
 			user.setEmail(email);
 			user.setPhone(phone);
 			user.setStatus(1);

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java

@@ -180,6 +180,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 	List<SysUser> getUserByRoleCode(@Param("roleCode") String roleCode,@Param("username") String username);
 
 	int getIncidentTicket(String id);
+	int getIncidentTicketChild(String id);
 
 	/**
 	 * 自动编号

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml

@@ -75,6 +75,9 @@
 	<select id="getIncidentTicket" resultType="int">
 			select count(accident_type) from incident_ticket_children where incident_ticket_id = #{id} and accident_type !='公司承担'
 	</select>
+	<select id="getIncidentTicketChild" resultType="int">
+			select count(accident_type) from incident_ticket_children where incident_ticket_id = #{id} and accident_type ='扣款'
+	</select>
 
 	<!-- 根据角色编码查询 -->
 	<select id="getUserByRoleCode" resultType="org.jeecg.modules.system.entity.SysUser">

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java

@@ -702,4 +702,8 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 	public int getIncidentTicket(String id){
 		return userMapper.getIncidentTicket(id);
 	}
+	@Override
+	public int getIncidentTicketChild(String id){
+		return userMapper.getIncidentTicketChild(id);
+	}
 }