parent
311525bfbd
commit
d2855d30ee
42 changed files with 911 additions and 217 deletions
@ -0,0 +1,15 @@ |
||||
package org.jeecg.modules.demo.base.entity.vo; |
||||
|
||||
import lombok.Data; |
||||
import org.jeecg.modules.demo.base.entity.ZyClothsComponent; |
||||
import org.jeecg.modules.demo.pro.entity.ZyProcessComponent; |
||||
|
||||
import java.util.List; |
||||
|
||||
@Data |
||||
public class ZyClothsComponentDetail { |
||||
/**制衣部件 详情*/ |
||||
private ZyClothsComponent zyClothsComponent; |
||||
/**部件工序 详情*/ |
||||
private List<ZyProcessComponent> zyProcessComponents; |
||||
} |
||||
@ -0,0 +1,19 @@ |
||||
package org.jeecg.modules.demo.base.entity.vo; |
||||
|
||||
|
||||
import lombok.Data; |
||||
import org.jeecg.modules.demo.base.entity.ZyClothsModular; |
||||
import org.jeecg.modules.demo.base.entity.ZyClothsModularCompent; |
||||
|
||||
import java.util.List; |
||||
|
||||
@Data |
||||
public class ZyClothsModularDetail { |
||||
/**制衣模块*/ |
||||
private ZyClothsModular zyClothsModular; |
||||
/**模块部件*/ |
||||
private List<ZyClothsModularCompent> zyClothsModularComponents; |
||||
/**模块工序*/ |
||||
private List<ZyProcessModularVo> zyProcessModularVos; |
||||
|
||||
} |
||||
@ -0,0 +1,80 @@ |
||||
package org.jeecg.modules.demo.base.entity.vo; |
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType; |
||||
import com.baomidou.mybatisplus.annotation.TableId; |
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import com.fasterxml.jackson.annotation.JsonFormat; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import org.jeecg.common.aspect.annotation.Dict; |
||||
import org.springframework.format.annotation.DateTimeFormat; |
||||
|
||||
import java.io.Serializable; |
||||
|
||||
/** |
||||
* 不知道什么原因 在base模块中无法调用ZyProcessModular实体类 |
||||
* 因此创建这个类来接受数据 |
||||
* @Description: 模块工序表 |
||||
*/ |
||||
@Data |
||||
@TableName("zy_process_modular") |
||||
public class ZyProcessModularVo implements Serializable { |
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
/** |
||||
* 主键 |
||||
*/ |
||||
@TableId(type = IdType.ASSIGN_ID) |
||||
@ApiModelProperty(value = "主键") |
||||
private java.lang.String id; |
||||
/** |
||||
* 创建人 |
||||
*/ |
||||
@ApiModelProperty(value = "创建人") |
||||
private java.lang.String createBy; |
||||
/** |
||||
* 创建日期 |
||||
*/ |
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") |
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
||||
@ApiModelProperty(value = "创建日期") |
||||
private java.util.Date createTime; |
||||
/** |
||||
* 更新人 |
||||
*/ |
||||
@ApiModelProperty(value = "更新人") |
||||
private java.lang.String updateBy; |
||||
/** |
||||
* 更新日期 |
||||
*/ |
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") |
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
||||
@ApiModelProperty(value = "更新日期") |
||||
private java.util.Date updateTime; |
||||
/** |
||||
* 所属部门 |
||||
*/ |
||||
@ApiModelProperty(value = "所属部门") |
||||
private java.lang.String sysOrgCode; |
||||
/** |
||||
* 模块ID |
||||
*/ |
||||
|
||||
@ApiModelProperty(value = "模块ID") |
||||
//@Dict(dictTable = "zy_cloths_modular", dicText = "modular_name", dicCode = "id")
|
||||
private java.lang.String modularId; |
||||
/** |
||||
* 工序ID |
||||
*/ |
||||
|
||||
@ApiModelProperty(value = "工序ID") |
||||
//@Dict(dictTable = "zy_process", dicText = "process_name", dicCode = "id")
|
||||
private java.lang.String processId; |
||||
/** |
||||
* 序号 |
||||
*/ |
||||
@ApiModelProperty(value = "序号") |
||||
private Integer serialnumber; |
||||
} |
||||
|
||||
|
||||
@ -1,19 +1,52 @@ |
||||
package org.jeecg.modules.demo.pro.service.impl; |
||||
|
||||
import org.jeecg.modules.demo.base.mapper.ZyClothsModularMapper; |
||||
import org.jeecg.modules.demo.pro.entity.ZyProcessComponent; |
||||
import org.jeecg.modules.demo.pro.mapper.ZyProcessComponentMapper; |
||||
import org.jeecg.modules.demo.pro.service.IZyProcessComponentService; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
||||
import org.springframework.util.ObjectUtils; |
||||
import org.springframework.util.StringUtils; |
||||
|
||||
import javax.annotation.Resource; |
||||
import java.util.List; |
||||
|
||||
/** |
||||
* @Description: zy_process_component |
||||
* @Author: jeecg-boot |
||||
* @Date: 2021-11-11 |
||||
* @Date: 2021-11-11 |
||||
* @Version: V1.0 |
||||
*/ |
||||
@Service |
||||
public class ZyProcessComponentServiceImpl extends ServiceImpl<ZyProcessComponentMapper, ZyProcessComponent> implements IZyProcessComponentService { |
||||
|
||||
@Resource |
||||
private ZyProcessComponentMapper zyProcessComponentMapper; |
||||
@Resource |
||||
private ZyClothsModularMapper zyClothsModularMapper; |
||||
|
||||
@Override |
||||
public List<ZyProcessComponent> detail(String id) { |
||||
List<ZyProcessComponent> zyProcessComponents = zyProcessComponentMapper.queryListByComponentId(id); |
||||
if (ObjectUtils.isEmpty(zyProcessComponents)) { |
||||
return zyProcessComponents; |
||||
} |
||||
for (ZyProcessComponent processComponent : zyProcessComponents) { |
||||
String processName = zyClothsModularMapper.getProcessNameByProcessId(processComponent.getProcessId()); |
||||
if (StringUtils.hasText(processName)){ |
||||
processComponent.setProcessId(processName); |
||||
}else{ |
||||
processComponent.setProcessId("null"); |
||||
} |
||||
String componentName = zyProcessComponentMapper.getComponentNameByComponentId(processComponent.getComponentId()); |
||||
if (StringUtils.hasText(componentName)){ |
||||
processComponent.setComponentId(componentName); |
||||
}else{ |
||||
processComponent.setComponentId("null"); |
||||
} |
||||
} |
||||
return zyProcessComponents; |
||||
} |
||||
} |
||||
|
||||
@ -0,0 +1,25 @@ |
||||
package org.jeecg.modules.zyclothsstyle.entity.vo; |
||||
|
||||
import lombok.Data; |
||||
import org.jeecg.modules.demo.zyStyleModular.entity.ZyStyleModular; |
||||
import org.jeecg.modules.demo.zyaccessories.entity.ZyStyleAccessories; |
||||
import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle; |
||||
import org.jeecg.modules.zystylefabric.entity.NewZyStyleFabric; |
||||
import org.jeecg.modules.zystylemodule.entity.NewStyleModule; |
||||
|
||||
import java.util.List; |
||||
|
||||
@Data |
||||
public class AllClothStyle { |
||||
/**服装款式*/ |
||||
private ZyClothsStyle zyClothsStyle; |
||||
/**子模块 款式模块*/ |
||||
private List<NewStyleModule> zyStyleModuleList; |
||||
/**子模块 款式面料*/ |
||||
private List<NewZyStyleFabric> zyStyleFabricList; |
||||
/**子模块 款式辅料*/ |
||||
private List<ZyStyleAccessories> zyStyleAccessoriesList; |
||||
/*子模块 款式型号 因风格问题 暂不开发*/ |
||||
/**子模块 款式工序*/ |
||||
private List<ZyStyleModular> zyStyleModularList; |
||||
} |
||||
Loading…
Reference in new issue