Merge remote-tracking branch 'origin/master'

master
mengjiao
commit 72f92cd776

@ -138,8 +138,10 @@ public class MesUnitpriceReport extends BaseEntity {
// @Excel(name = "平均工资")
// private String avgResult;
@Excel(name = "工时工资")
@Excel(name = "时薪")
private String realWages;
@Excel(name = "备注", readConverterExp = "1=请假")
private String remark;
/**
*
@ -152,7 +154,6 @@ public class MesUnitpriceReport extends BaseEntity {
* $column.columnComment
*/
public BigDecimal getKk() {
return kk;
}

@ -358,8 +358,10 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService
mainObject.append(",\"PZYCMS\":"+"\""+detailInfo.getRemark()+"\"");//品质异常描述
mainObject.append(",\"Notes\":"+"\"\"");//测试备注
mainObject.append(",\"SFXYZG\":"+"\""+task.getSfxyzg()+"\"");//*是否需要主管审核 1否 0是
mainObject.append(",\"PGZG\":"+"\""+task.getPgzg()+"\"");//QC主管SFXYZG字段为"是",则此项选择QC主管信息
mainObject.append(",\"PGZR\":"+"\""+task.getPgzr()+"\"");//质量主管 660朱继新
if("0".equals(task.getSfxyzg())){
mainObject.append(",\"PGZG\":"+"\""+task.getPgzg()+"\"");//QC主管SFXYZG字段为"是",则此项选择QC主管信息
mainObject.append(",\"PGZR\":"+"\""+task.getPgzr()+"\"");//质量主管 660朱继新
}
mainObject.append(",\"SFGYSWT\":"+"\""+task.getSfgyswt()+"\"");//*是否供应商问题 1非供应商问题 0是供应商问题
mainObject.append("}");

@ -319,7 +319,7 @@
from base_product bp
left join qc_material_group qmg on qmg.group_code = bp.mvgr5
where bp.product_code like concat('%',#{materialCode},'%')
and bp.del_flag = '0'
and bp.del_flag = '0' and qmg.del_flag = '0'
order by qmg.create_time desc
</select>
<select id="selectExist" resultType="com.op.quality.domain.QcMaterialGroupDetail">

Loading…
Cancel
Save